Managing merge conflicts

Your interactive guide to resolving merge conflicts

Git
Merge conflicts

Join this course

GitHub Learning Lab is an integrated learning experience to help you learn how to use GitHub by using GitHub. Complete courses at your own pace on collaboration, workflow, and more.

Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with other developers. While resolving differences might involve some discussion, merge conflicts don’t have to be scary. This course guides you through the steps to finding the best merge conflict solution, so your team can keep building. See a word you don't understand? We've included an emoji :book: next to some key terms. Click on it to see its definition.

After you complete this course, you’ll be able to:

  • Understand how merging happens and what causes merge conflicts
  • Resolve simple and complex merge conflicts with ease
  • Share best practices to reduce merge conflicts with your team

This course has a dedicated message board on the GitHub Community website. If you want to discuss this course with GitHub Trainers or other participants create a post over there. The message board can also be used to troubleshoot any issue you encounter while taking this course.

Ready to start learning?