search

msorre2 / merge-conflict

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

Advanced Conflicts #5

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

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

Step 9: Resolve conflicts in the Advanced Conflicts pull request

Just like your first conflict, this pull request is already conflicted.

This time, however, I've made it a bit more complicated.

:keyboard: Activity: Resolve these conflicts

  1. Click Resolve conflicts
  2. On the left, you will notice two files listed: _data/experience.yml and _data/interests.yml. Let's start with experience.yml
  3. Notice there are two distinct sets of conflict markers. This is because multiple sections of the file were modified on both branches, so Git identified the two changes within the file as two separate conflicts
  4. Optional: Again, if you're trying to use this course to build a resume, you can resolve the conflicting files with your own information
  5. With the merge conflicts resolved and the markers removed in the experience.yml file, click Mark as resolved
  6. GitHub will present the next file with conflicts, interests.yml
  7. This file has some extra merge commit markers. Simply select the Interests you would like to list and remove the others (and all those extra conflict markers)
  8. When you are finished, click Mark as resolved
  9. Click Commit merge

Watch below for my response

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

Step 10: Merge fourth pull request

Great job, @msorre2, your pull request is free of conflicts. :tada:

:keyboard: Activity: Merge this pull request

Go ahead and merge this pull request now.

  1. Click Merge pull request below
  2. Click Confirm Merge
  3. Click Delete branch

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

Yay! You've done it! You've resolved all of the conflicts. I have a few pointers for completing your resume, so I've opened one last issue for that information.

Check out the final issue here!