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. Checkout to the add-experience branch and ensure it is up to date:

   git checkout add-experience
   git pull

2. Merge the master branch into the add-experience branch. To ensure that you're working with an up to date copy of master, we'll use its remote tracking branch:

   git merge origin/master

3. In Git's response, you'll see two files with conflicts: _data/experience.yml and _data/interests.yml.
4. Open _data/experience.yml in your text editor.
5. Remove the conflict markers and pick your desired content.
6. With the merge conflicts resolved and the markers removed in the _data/experience.yml file, stage the file:

   git add _data/experience.yml

7. Open the next file in your text editor: _data/interests.yml.
8. Remove the conflict markers and pick your desired content.
9. Close the file. Stage it and commit your changes:

   git add _data/interests.yml
   git commit -m "merge master into add-experience"

10. Push your merged branches to GitHub:

    git push

---

Watch below for my response.