git分支管理

主分支

git checkout -b develop master
git checkout master
git merge --no-ff develop

功能分支 - feature

git checkout -b feature-x develop

git checkout develop
git merge --no-ff feature-x
git branch -d feature-x

预发布分支 - release

git checkout -b release-1.2 develop

git checkout master
git merge --no-ff release-1.2
git tag -a 1.2

git checkout develop
git merge --no-ff release-1.2

git branch -d release-1.2

修补bug分支 - fixbug

git checkout -b fixbug-0.1 master

git checkout master
git merge --no-ff fixbug-0.1
git tag -a 0.1.1

git checkout develop
git merge --no-ff fixbug-0.1

git branch -d fixbug-0.1