More conflicts

[github-learning-lab]

Step 3: Resolve more complex conflicts

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 someone forgets to remove the markers while resolving a conflict.

⌨️ 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 _data/experience.yml.
3. Remove the conflict markers and pick your desired content.
4. With the merge conflicts resolved and the markers removed in the _data/experience.yml file, click Mark as resolved.
5. GitHub will present the next file with conflicts, _data/interests.yml.
6. Remove the conflict markers and pick your desired content.
7. When you are finished, click Mark as resolved.
8. Click Commit merge.

---

Watch below for my response.

[github-learning-lab]

Step 4: Merge pull request

Great job, @violadelbono, your pull request is free of conflicts. 🎉

⌨️ Activity: Merge this pull request

Go ahead and merge this pull request now.

1. Click Merge pull request below.
2. Click Confirm Merge.
3. Click Delete branch.

---

Watch below for my response.

[github-learning-lab]

Good job! You've solved more merge conflicts.

---

Go to the next pull request now.