- Kickstart tutorial
- Must-read tutorial: the concepts of branching and merging note the collaborating link at the bottom
- A branching top-down view
- How to resolve merge conflicts in Git? - Stack Overflow Very good hints below the solution.
- Github's help for merging from commandline
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.