How do I resolve merge conflicts in my Git repository?
It opens a GUI that steps you through each conflict, and you get to choose how to merge. Sometimes it requires a bit of hand editing afterwards, but usually it’s enough by itself. It is much better than doing the whole thing by hand certainly.
As per Josh Glover’s comment:
doesn’t necessarily open a GUI unless you install one. Running
git mergetoolfor me resulted in
vimdiffbeing used. You can install
one of the following tools to use it instead:
Below is a sample procedure using
vimdiff to resolve merge conflicts, based on this link.
Run the following commands in your terminal
git config merge.tool vimdiff git config merge.conflictstyle diff3 git config mergetool.prompt false
This will set
vimdiffas the default merge tool.
Run the following command in your terminal
You will see a
vimdiffdisplay in the following format:
â•”â•â•â•â•â•â•â•â•¦â•â•â•â•â•â•â•¦â•â•â•â•â•â•â•â•â•— â•‘ â•‘ â•‘ â•‘ â•‘ LOCAL â•‘ BASE â•‘ REMOTE â•‘ â•‘ â•‘ â•‘ â•‘ â• â•â•â•â•â•â•â•â•©â•â•â•â•â•â•â•©â•â•â•â•â•â•â•â•â•£ â•‘ â•‘ â•‘ MERGED â•‘ â•‘ â•‘ â•šâ•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•
These 4 views are
- LOCAL: this is the file from the current branch
- BASE: the common ancestor, how this file looked before both changes
- REMOTE: the file you are merging into your branch
- MERGED: the merge result; this is what gets saved in the merge commit and used in the future
You can navigate among these views using ctrl+w. You can directly reach the MERGED view using ctrl+w followed by j.
You can edit the MERGED view like this:
If you want to get changes from REMOTE
If you want to get changes from BASE
If you want to get changes from LOCAL
Save, Exit, Commit, and Clean up
:wqasave and exit from vi
git commit -m "message"
git cleanRemove extra files (e.g.
*.orig) created by the diff tool.