git branch naming

Question

How do you name your git branches?

How are brunch and tag determined?

Is there any naming convention?

Answer 1

We generally use the following naming method:

• branch generally adopts: dev/x.y.z method. Such as: dev/1.0.1, dev/1.0.2

• tag generally adopts: prod/x.y.z method. Such as: prod/1.0.1, prod/1.0.2

However, it is recommended to use the semver method entirely: http://semver.org/lang/zh-CN/

Answer 2

Yes, the classic Git flow model

http://www.ituring.com.cn/article/56870

http://danielkummer.github.io/git-flow-cheatsheet/index.zh_CN.html

All major operating system distributions have corresponding software package support, please see the link above.

Simply put,

The main branch master is always the available stable version
The development branch develop is the version that is being tested but not online

Function and feature development is carried out in the feature branch. After completion, it is merged into develop for testing.
Online emergency bug correction is carried out in the hotfix branch. After the correction is completed, it is merged into master

Name

master
develop
feature/xxx
hotfix/xxx

release/version number
Tag the corresponding version before release