GitHub实践入门 ~ Pull Request引发的开发变革特设网站http://ituring.github.io/first-pr/PR/Git冲突时的解决方法如何解决 PR 冲突问题Resolving a merge conflict from the command line