GIT分支管理是一门艺术.pdfVIP

 1     GIT          2     (origin)“ (master)”“(develop)”          3     (master) (develop)     4     “”     5     “” “” “ ” “BUG”     6     “” “”     7     “” “Feature branches” “Release branches” “Hotfix branches”     (master/ develop)(feature/release/hotfixes)          8     “Feature branches” developdevelop     9     “Feature branches” “develop”“Fearture branches”“ ”     10     “Feature branches”“develop” git checkout -b myfeature develop     11     “Feature branches”“develop” git checkout devleop git merge --no-ff myfeature (--no-ff not fast forward git merge fast forward merge commit) (--no-ff “Feature branches”) git branch -d myfeature git push origin develop          12     “Release branch” develop“develop”“master” “release-*”     13     “Relase branch”“” “bug ” “ ” “develop”     14     “Release branch”“develop” “Feature branches”“develop”     15     “Release branches” git checkout -b release-1.2 develop ./bump-version.sh  1.2 ( 1.2 bump-version.sh) git commit -a -m  Bumped version number to  1.2     16     “Release branches”bug “develop”     17     bug“Release branches” “Release branches”“master” masterTAG() “Release branches”“develop” git checkout master git merge --no-ff release-1.2 git tag -a 1.2 (-u/-s/-atagtag) git checkout develop git merge --no-ff release-1.2 git branch -d release-1.2     18     “Hotfix branches”“master” “develop”“master” “hotfix-*”     19     “Hotfix branches”“Release branch” BUG     20     “Hotfix branches” “develop” BUG          21     “Hotfix branches” git checkout -b hotfix-1.2.1 master ./bump-version.sh 1.2.1 git commit -a -m Bumpt version to 1.2.1 ( ) git commit -m Fixed severe production problem ( )     22     BUG“Hotfix branches”“master” “develop” git checkout master git merge --no-ff hotfix-1.2.1 git tag -a 1.2.1 git checkout develop git merge --no-ff hotfix-1.2.1