Git flow

git flow是一种现在主流的开发流程，当然用svn的不必参考了，首先列出几个更为专业却准确的链接

https://danielkummer.github.io/git-flow-cheatsheet/

https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

http://www.ruanyifeng.com/blog/2015/12/git-workflow.html

https://www.git-tower.com/learn/git/ebook/cn/command-line/advanced-topics/git-flow

 

当然不用git flow也是可以的，举个例子，这里就不过分细节了：

git checkout master
git checkout -b develop
git checkout -b feature_branch
# work happens on feature branch
git checkout develop
git merge feature_branch
git checkout master
git merge develop
git branch -d feature_branch

 

git checkout master
git checkout -b hotfix_branch
# work is done commits are added to the hotfix_branch
git checkout develop
git merge hotfix_branch
git checkout master
git merge hotfix_branch

 

end