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. Click on the Files changed tab in this pull request.
2. Click in the top right-hand corner of the _data/education.yml file that had been previously modified.
3. Click Edit file to open the file editor.
4. Modify the content in the degree:, uni:, year:, and summary: lines.
5. Scroll to the bottom of the page and enter a commit message for your change.
6. Click the Commit changes button, making sure the "Commit directly to the add-education branch" option is selected.

---

Watch below for my response.