Introduction to the

There are a lot of information about git branch management on the web. There are a lot of information about Git branch management on the web, but there are a lot of information about Git branch management on the web, but there are a lot of information about Git branch management on the web, but there are a lot of information about Git branch management

Branch management

Git branch management can be divided into four main branches: Dev, test, UAT and Master. In daily development, there are also hotfix branches and feature branches, and each branch has different meanings. Each dev branch can be merged into the test branch only after the local coordination is successful. Each developer’s locally developed branch can only merge with the feature branch, but cannot merge from the feature branch into his own local branch. This operation is irreversible to avoid branch contamination.

Each branch represents meaning

Dev branch

Dev branch is used for the branch corresponding to the development environment when front-end and back-end developers are coordinated after the development of required functions, and there are untested functional requirements in this branch.

The test branch

The test branch refers to the branch where developers submit tests after successful integration and the branch where test environment is used.

Uat branch

The UAT branch is a pre-production environment release branch, the branch code stays in sync with the online, merge the branch must be operated by a specific person merge UAT merge.

The master branch

The master branch is a generated branch that merges directly from the UAT branch.

Hotfix branch

The hotfix branch is the patch branch of the official line. When the code on the line has a bug, you need to tag a branch from the latest Mater to fix the bug. This branch is usually named hotfix(functionality)-member(module)-master(source)-1111(date).

Feature branch

The feature branch is to develop the branch for new functions. Based on online master pull, it can be directly developed on the branch, or each person can pull his or her own branch from the feature branch. Naming conventions: Hotfix (functionality)-member(module)-master(source)-1111(date), development can also pull its own branch based on the sub-branch: hotfix(functionality)-member(module)-master(source)-1111(date) -lCM (name). After the development is completed, it will be merged into the feature branch.

Branch flow diagram

After all this information, I still feel vague. Git branch flows are shown below

This is purely my personal opinion. Please comment on it. If you have any questions, please add enmukeji on wechat