⇦ Back to: Update Pull Request | ⇧ Overview
Git can handle many merges automatically, even if they affect the same file, as long as they don’t modify the same line in different (incompatible) ways. If it can’t then it’s up to you.
<aside> 💡 Resolving merge conflicts involves manually specifying what the result combining multiple commits affecting the same line(s).
</aside>
To handle the merge conflicts you need to:
You see a warning about a merge conflict when merging branches, like this:
Depending on whether you have a compatible editor installed, GitHub desktop may offer to open the conflict in the editor. Click on that.
If you click on the button, the editor shows the each of the (groups of) conflicting lines like this:
In the PR, if there are conflicts with the base branch, you may see a dialog like this:
Click on the button to see the merge conflict, each of which will look something like this:
