search

msorre2 / merge-conflict

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

Another User's Change #3

Closed github-learning-lab[bot] closed 5 years ago

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

Step 6: Conflicting change

This pull request adds changes to the _data/education.yml file. It's the same file that you just changed in your pull request.

After you merge this pull request, your pull request will have a merge conflict. That's because there will have been changes on two different branches to the same part of the same file.

:keyboard: Activity: Approving a pull request

  1. In the pull request status window below, click Add your review
  2. When the pull request review window displays, select Approve and click Submit review

Watch below for my response

teacherbot[bot] commented 5 years ago

:wave: hiya Please remember to delete your branch after merging or closing if you haven't done so already.

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

I was so excited about your approval that I've merged the PR! Since we both edited the same file without a linear history, this means that now we'll have some conflicts to resolve.

:keyboard: Activity: Delete the branch

  1. Delete this branch

Go back to your pull request to resolve the conflict