search

HomeSR78 / merge-conflict

https://lab.github.com/githubtraining/managing-merge-conflicts
MIT License
0 stars 0 forks source link

Create your own Conflict #4

Open github-learning-lab[bot] opened 5 years ago

github-learning-lab[bot] commented 5 years ago

Step 5a: Create your own conflict

So far, this pull request doesn't have any conflicts, but 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.

:keyboard: Activity: Make changes on this branch

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

Watch below for my response