Create your own conflict

[github-learning-lab]

Step 5: Create your own conflict

So far, this pull request doesn't have any conflicts. I have added some new branch protections to prevent you from merging before you're ready.

In the last activity, you solved a merge conflict that someone else created. This time, you'll create the merge conflict yourself.

⌨️ Activity: Make changes on this branch

1. Check out to this branch:

   git checkout add-education

2. Open _data/education.yml in your text editor.
3. Modify the content in the degree:, uni:, year:, and summary: lines.
4. Stage and commit the changes:

   git add _data/education.yml
   git commit -m "<YOUR-MESSAGE>"

5. Push your changes to GitHub:

   git push

---

Watch below for my response.