search

lilian-delgado-jalafund / merge-conflicts

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

Another User's Change #2

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

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

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 this pull request is merged, 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.