Learn how to merge two branches in Git. There are multiple ways to merge code in Git, including the Merge command and Pull Request.

Learn how to resolve Merge Conflicts in Git using this guide. Merge Conflicts can occur if the same parts of code are changed in different branches.

Design & Dev GitHub Desktop 1.5 makes it easy to resolve frustrating merge conflicts Merge conflict resolution just got a whole of a lot easier.

This Git and GitHub tutorial for beginners teaches how to use these source code version control tools that are at the heart of modern app development.