diff --git a/docs/contribute.md b/docs/contribute.md index d42eb3f9..99d10c25 100644 --- a/docs/contribute.md +++ b/docs/contribute.md @@ -22,3 +22,17 @@ The `stable` branch may have hotfixes directly from the `stable` branch, and the # Code Of Conduct 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 +``` \ No newline at end of file diff --git a/scripts/merge-to-branch.sh b/scripts/merge-to-branch.sh index f353c5c3..090b6933 100644 --- a/scripts/merge-to-branch.sh +++ b/scripts/merge-to-branch.sh @@ -4,7 +4,7 @@ branch=zen-"$1" default_branch="central" if [ $branch = "zen-stable" ]; then - $(dirname $0)/merge-to-branch.sh twilight + default_branch="zen-twilight" fi git checkout "$branch"