GitHub实践入门 ~ Pull Request引发的开发变革

特设网站

http://ituring.github.io/first-pr/

Git冲突时的解决方法

• Resolving merge conflicts
• Resolving a merge conflict from the command line