[Transfer] Development and online process based on GitFlow

What is GitFlow

GitFlow is a model for organizing software development activities built on Git, and it is a software development best practice built on Git.

Branch process description

 

 

 

 

Two long-standing branches of the project

• master: The main branch, responsible for recording the iteration of the online version, the code of this branch is completely consistent with the online code.
• develop: Development branch, which records relatively stable versions, and all feature branches and hotfix branches are created from this branch.

Other branches are short-term branches, which need to be deleted after functional development is completed

• feature/*: The feature (function) branch is used to develop new functions. Different functions create different function branches. After the development of the function branch is completed and the self-test passes, it needs to be merged into the develop branch, and then delete the branch.
• release/*: Release branch, used for code launch preparation. This branch is created from the develop branch. After creation, it is released to the test environment for testing. If bugs are found during testing, developers need to fix bugs on the release branch. Before going online, the release branch needs to be merged into the master branch and the develop branch.
• hotfix/*: Repair branch. This branch is only used in emergencies. It is created from the master branch to urgently repair online bugs. After the repair is completed, the branch needs to be merged into the master branch for online use, and then merged into the develop branch.

branch command specification

feature (feature) branch

The branch name of the function branch should be a brief English expression that can accurately describe the function

feature/new-feature

fix branch

The branch name of the repair branch is the minor version number. For example, the current version is 1.4.5, and the newly created repair branch is: hotfix/1.4.6, and a brief description in English can also be added.

hotfix/1.4.6-a-bug

release branch

The release branch is a pre-release branch, named for the version number, date, and English abbreviation of the main function of this release.

release/1.5.0-20170810-new-milestone

tool

SourceTree

refer to

A successful Git branching model

Best Practices for Git in Teams - How to Use Git Flow Correctly

git-flow workflow