Join egghead, unlock knowledge.

Want more egghead?

This lesson is for members. Join us? Get access to all 3,000+ tutorials + a community with expert developers around the world.

Unlock This Lesson
Become a member
to unlock all features

Level Up!

Access all courses & lessons on egghead today and lock-in your price for life.


    Fix a Pull Request that has a Merge Conflict


    If we try to make a pull request on github that has a conflict, there are a few ways to fix it.

    We're going to first back out of the pull request, and then merge master into our feature branch.

    We'll manage the merge conflict locally, and then do a new pull request (which will not have the conflict)