mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-06 03:18:19 +00:00
Refactor merge-to-branch script to handle "zen-stable" branch and merge to "twilight" branch if specified
This commit is contained in:
@@ -3,6 +3,10 @@ set -ex
|
|||||||
branch=zen-"$1"
|
branch=zen-"$1"
|
||||||
default_branch="central"
|
default_branch="central"
|
||||||
|
|
||||||
|
if [ $branch = "zen-stable" ]; then
|
||||||
|
$(dirname $0)/merge-to-branch.sh twilight
|
||||||
|
fi
|
||||||
|
|
||||||
git checkout "$branch"
|
git checkout "$branch"
|
||||||
git merge "$default_branch"
|
git merge "$default_branch"
|
||||||
git push origin "$branch"
|
git push origin "$branch"
|
||||||
|
Reference in New Issue
Block a user