Course
Fix Common Git Mistakes
Fix a Pull Request that has a Merge Conflict
InstructorChris Achard
Published 4 years ago
Updated 3 years ago
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)
egghead
~ just now
Markdown supported.
Become a member to join the discussionEnroll Today
Member comments are a way for members to communicate, interact, and ask questions about a lesson.
The instructor or someone from the community might respond to your question Here are a few basic guidelines to commenting on egghead.io
Be on-Topic
Comments are for discussing a lesson. If you're having a general issue with the website functionality, please contact us at support@egghead.io.
Avoid meta-discussion
Code Problems?
Should be accompanied by code! Codesandbox or Stackblitz provide a way to share code and discuss it in context
Details and Context
Vague question? Vague answer. Any details and context you can provide will lure more interesting answers!