mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-06 03:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor merge-to-branch script to handle "zen-stable" branch and merge to "zen-twilight" branch if specified

Browse Source
This commit is contained in:
mr. M
2024-10-11 19:16:19 +02:00
parent 6d9e54043c
commit 45e751a8be
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/contribute.md
View File

@@ -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
```

2
scripts/merge-to-branch.sh
View File

@@ -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"