http://git-scm.com/book/zh/v1/
简明教程
http://rogerdudler.github.io/git-guide/index.zh.html
解决同一分支远程和本地冲突
http://www.01happy.com/git-resolve-conflicts/
coding.net
https://coding.net/u/coding/p/Coding-Feedback/git/blob/master/git-starter-tutorial.md
原文：http://gaojy.blog.51cto.com/4980848/1616324