git checkout -b develop master
# 切换到Master分支
git checkout master
# 对Develop分支进行合并
git merge --no-ff develop
* 功能（feature）分支
* 预发布（release）分支
* 修补bug（fixbug）分支
git checkout -b feature-x develop
git checkout develop
git merge --no-ff feature-x
git branch -d feature-x
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
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