Advanced Conflicts

[github-learning-lab[bot]]

Step 9: Resolve conflicts in the Advanced Conflicts pull request

Just like your first conflict, this pull request is already conflicted.

This time, however, I've made it a bit more complicated.

• Instead of one conflict, you get three!
• Instead of conflicts in one file only, you get two!
• One of your files actually has some leftover merge conflict markers. This can happen if your colleagues resolve merge conflicts locally and forget to remove the markers.

:keyboard: Activity: Resolve these conflicts

1. Click Resolve conflicts
2. On the left, you will notice two files listed: _data/experience.yml and _data/interests.yml. Let's start with experience.yml
3. Notice there are two distinct sets of conflict markers. This is because multiple sections of the file were modified on both branches, so Git identified the two changes within the file as two separate conflicts
4. Optional: Again, if you're trying to use this course to build a resume, you can resolve the conflicting files with your own information
5. With the merge conflicts resolved and the markers removed in the experience.yml file, click Mark as resolved
6. GitHub will present the next file with conflicts, interests.yml
7. This file has some extra merge commit markers. Simply select the Interests you would like to list and remove the others (and all those extra conflict markers)
8. When you are finished, click Mark as resolved
9. Click Commit merge

---

Watch below for my response