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.
After you complete this course, you’ll be able to:
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.
Resolve your first merge conflict
Merge the pull request that holds your first, simple conflict
Resolve the merge conflict in a more complex pull request
Merge the pull request
Commit changes to the `_data/education.yml` file on the `add-education` branch in the 'Create Your Own Conflict' Pull Request
Resolve the conflict in the 'Create Your Own Conflict' pull request
Merge the 'Create Your Own Conflict' pull request
All public courses on Learning Lab are free.