Merge Conflicts
tutorial
Atlassian
In this tutorial, you will learn about what merge conflicts are in Git, the different types of merge conflicts, and how to resolve them correctly. This is helpful for when you collaborate on a project with other developers and encounter different types of merge conflicts. Merge conflicts can be challenging at first, but this resource will help you have a plan for how to deal with them when they arise.
Join the conversation