# 当git建立一个库以后
# 默认分支一般为master
# 所以我们只需要创建一个名为develop的新分支
# 作为我们的开发分支

# 创建develop分支
git checkout -b develop master
# 把本地的内容推到远程仓库
git push -u origin develop

继承分支：develop
合并分支：develop
命名规则：任何名字除了master, develop, release-*, hotfix-*

# 创建feature分支 #

# 保证本地的develop是最新的
git checkout develop
git pull origin develop
# 从develop创建myfeature分支，并切换到myfeature分支
git checkout -b myfeature develop
# 之后你可以在这个分支上commit新的feature

# 提交feature分支 #

# 保证本地的develop是最新的
git checkout develop
git pull origin develop
# 合并myfeature到develop分支
git merge --no-ff myfeature -m ""
# 删除myfeature分支
git branch -d myfeature
# 推送develop到upstream
git push origin develop

继承分支：develop
合并分支：develop master
命名规则：release-*

# 创建release分支 #

git checkout -b release-1.2 develop
# 可选，用于更新某些本地文件来跟进版本变化
./bump-version.sh 1.2
git commit -a -m "Bumped version number to 1.2"

# 提交release分支 #

git checkout master
git merge --no-ff release-1.2 -m ""
# 给当前提交打上版本标签
git tag -a 1.2 -m ""
git push
git push --tags
# 把release-1.2上的内容合并回develop
git checkout develop
git pull origin develop
git merge --no-ff release-1.2 -m ""
git push
# 删除分支
git branch -d release-1.2

继承分支：master
合并分支：develop master
命名规则：hotfix-*

# 创建hotfix分支 #

git checkout master
git pull origin master
git checkout -b hotfix-1.2.1 master
# 可选
./bump-version.sh 1.2.1
git commit -a -m "Bumped version number to 1.2.1"

# 提交hotfix分支 #

# 合并到master
git checkout master
git pull origin master
git merge --no-ff hotfix-1.2.1 -m ""
git tag -a 1.2.1 -m ""
git push
git push --tags
# 合并到develop
git checkout develop
git pull origin develop
git merge --no-ff hotfix-1.2.1 -m ""
git push
# 删除分支
git branch -d hotfix-1.2.1

# 推送分支到upstream
git push -u origin some-branch
# 删除upstream上的分支
git push origin --delete some-branch

git flow init

# 创建feature分支
git flow feature start <name>

# 提交feature分支
git flow feature finish <name>

# 创建release分支
git flow release start <name>

# 提交release分支
git flow release finish <name>

# 创建hotfix分支
git flow hotfix start <name>

# 提交hotfix分支
git flow hotfix finish <name>