mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-07 23:00:01 +02:00
Refactor merge-to-branch script to handle "zen-stable" branch and merge to "twilight" branch if specified
This commit is contained in:
parent
49f7a457cd
commit
2b68cc481e
1 changed files with 4 additions and 0 deletions
|
@ -3,6 +3,10 @@ set -ex
|
|||
branch=zen-"$1"
|
||||
default_branch="central"
|
||||
|
||||
if [ $branch = "zen-stable" ]; then
|
||||
$(dirname $0)/merge-to-branch.sh twilight
|
||||
fi
|
||||
|
||||
git checkout "$branch"
|
||||
git merge "$default_branch"
|
||||
git push origin "$branch"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue