The repository is structured as follows:
dev (main branch)
| |
| \--->-- stable (release branch)
| ^
^ |
| \-<- Hotfix (hotfixes directly from stable)
|
\-<- (features branches)
The central
branch is the main branch of the repository, and it is the default branch for the repository. The twilight
branch is the feature branch, and it is branched off from the central
branch. The stable
branch is the release branch, and it is branched off from the central
branch.
The stable
branch may have hotfixes directly from the stable
branch, and the twilight
branch may have feature branches branched off from the twilight
branch. This is done so that we can apply hotfixes like security patches directly to the stable
branch without having to merge the changes from the twilight
branch.
Please read our Code of Conduct before contributing.
To merge zen twilight branch from the central branch, you can use the following command:
sh ./scripts/merge-to-branch.sh twilight
To merge zen stable branch from the twilight branch, you can use the following command:
sh ./scripts/merge-to-branch.sh stable