mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-07 21:49:58 +02:00
Refactor merge-to-branch script to handle "zen-stable" branch and merge to "zen-twilight" branch if specified
This commit is contained in:
parent
6d9e54043c
commit
45e751a8be
2 changed files with 15 additions and 1 deletions
|
@ -22,3 +22,17 @@ The `stable` branch may have hotfixes directly from the `stable` branch, and the
|
||||||
# Code Of Conduct
|
# Code Of Conduct
|
||||||
|
|
||||||
Please read our [Code of Conduct](../CODE_OF_CONDUCT.md) before contributing.
|
Please read our [Code of Conduct](../CODE_OF_CONDUCT.md) before contributing.
|
||||||
|
|
||||||
|
# Releasing/Merging branches
|
||||||
|
|
||||||
|
To merge zen twilight branch from the central branch, you can use the following command:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sh ./scripts/merge-to-branch.sh twilight
|
||||||
|
```
|
||||||
|
|
||||||
|
To merge zen stable branch from the twilight branch, you can use the following command:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sh ./scripts/merge-to-branch.sh stable
|
||||||
|
```
|
|
@ -4,7 +4,7 @@ branch=zen-"$1"
|
||||||
default_branch="central"
|
default_branch="central"
|
||||||
|
|
||||||
if [ $branch = "zen-stable" ]; then
|
if [ $branch = "zen-stable" ]; then
|
||||||
$(dirname $0)/merge-to-branch.sh twilight
|
default_branch="zen-twilight"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git checkout "$branch"
|
git checkout "$branch"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue