Master branch
Master is the master branch. When the project is created, the default master branch is created to ensure the stability of the master branch. The code of the master branch is not allowed to be directly modified and submitted. The master branch is merged with the D Hotfix and release branches. Every release should be packaged from the Master, preferably with a tag tag
Develop branch
The Develop branch is the latest branch for all developed features and bug fixes, and is more complete than the master branch. When developing new features, you pull code from the Develop branch, merge the code into the Develop branch, and remove the pulled branches.
Feature branch
To develop new features, you need to pull the feature branch from the Develop branch and name the branch feature- Feature English/module English. Merge the code into Develop after development. Delete the feature branch
Release branch (pre-release branch)
When a set of features are developed, they are first merged into the Develop branch, and release branches are created based on the Develop branch. If there are bugs that need to be fixed during testing, they are fixed and submitted directly by the developer in the Release branch. After the fix is complete, the code is merged into the Develop and Master branches
Hotfix branch (Bug fix branch)
Create hotfix branches based on the master branch and merge them with the Master branch and develop branch. Name the hotfix-bug branch
The specific flow direction is shown as follows:
