Repository files navigation

Learn why conflicts happen and how to resolve them.

Good start! Now let's look deeper at a merge conflict! 🔍

This can be intimidating, but have no fear, Git is smart when it comes to merging! Git only needs a human to decide how toresolve the conflict. Sometimes, the best way to resolve a merge conflict is to add content that's from both branches, or even something that isn't on either! This is why Git needs a human to look at the code and make the proper fixes.

1. Open the pull request that you just created, we created a conflict for you. Have no fear!
2. At the bottom of the page, under "This branch has conflicts that must be resolved", click theResolve conflicts button.
3. Look for the highlighted sections that begins with<<<<<<< my-resume and ends with>>>>>>> main. These markers are added by Git to show you the content that is in conflict.
4. Remove the changes made on the main branch by deleting all of the content below the======= and above>>>>>>> main.
5. Next, remove the merge conflict markers by deleting the following lines:

   <<<<<<< my-resume=======>>>>>>> main

6. With the merge conflict markers removed, clickMark as resolved.
7. Finally, clickCommit merge.
8. Wait about 20 seconds then refresh this page (the one you're following instructions from).GitHub Actions will automatically update to the next step.

Get help:Post in our discussion board •Review the GitHub status page

© 2023 GitHub •Code of Conduct •MIT License