In order to avoid the background of maintaining two code requires custom development branch and mainline keep the code consistent
1, mainline to Di prepare master, all hotfix branches, development develop branch, customized product line branch, we should master as a benchmark to keep the main consistent
2, repair emergency bug, complete hotfix developed by master pull branch, the test is completed , while the code to be incorporated into the master and develop
. 3, a conventional pull develop developed by the combined branch, to develop the code, the test is completed, the master develop to merge
. 4, custom-developed product line, the master branch pull, and remain independent. For example feature_master
5, feature_master want to keep a stable development branch version, developed from conventional pull feature_master development branch
6, the development of new tasks, new features involved if you want to keep the same time in the main line and feature_master, pull from the master branch, developed after the completion of the merger to feature_master development branch
7, feature_master unique features, feature_master development branch drawing code, developers only after the completion of the merger alone to feature_master development branch, but note that this part of the code to make use of separate documents, local conditions can not be used to circumvent the compiler
8, the main line after the master version sent, to master merge into feature_master development branch, in order to protect the repair BUG, new features synchronized to feature_master, but also ensure that the code is consistent thread
In addition, all public branch developer can not strong push code, you must build a merge request