Two long-term branches :
The main branch
master (should be set as a protection branch)
development branch
develop
Three short-term branches:
version branch
release
Function branch
feature
patch branch
hotfix
Steps:
new version development
1. Create a new project, the default
master
branch.
2. Create a
develop
branch based on the master branch.
3. When developing a certain version, create a
release
branch, such as:
release/v1.0
[_{requirement ID}].
4. Locally create a new functional branch, such as
feature/SEO
.
5. After the function is developed,
merge the feature into the release branch
.
6. After the version development is completed,
merge the release to the develop branch
and submit it for testing.
7. After the test is completed,
merge develop into master
for launch.
8. After successful launch,
tag the master branch
, such as tag/v1.0.
Formal environment bug fixes
1. Pull the
hotfix
branch from the master branch, such as:
hotfix_525
.
2. After the repair is completed, merge it into the master branch. Publish the test environment.
3. Merge the hotfix branch into the develop branch.
4.
Delete the hotfix branch