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.
We'll answer common questions like:
And when you're done you'll be able to:
We recommend taking Introduction to GitHub prior to this course.
This makes use of the following open source projects. Consider exploring these repos and maybe even making contributions!
New developers, new GitHub users, users new to Git, students, managers, teams
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.