How to resolve merge conflicts in a Git repository

Try: git mergetool

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:

The command

doesn’t necessarily open a GUI unless you install one. Running git mergetool for me resulted in vimdiff being used. You can install one of the following tools to use it instead: meld, opendiff, kdiff3, tkdiff, xxdiff, tortoisemerge, gvimdiff, diffuse, ecmerge, p4merge, araxis, vimdiff, emerge.

Below is the sample procedure to use vimdiff for resolve merge conflicts. Based on this link

Step 1: Run following commands in your terminal

git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false

This will set vimdiff as the default merge tool.

Step 2: Run following command in terminal

git mergetool

Step 3: You will see a vimdiff display in following format

  ╔═══════╦══════╦════════╗
  ║       ║      ║        ║
  ║ LOCAL ║ BASE ║ REMOTE ║
  ║       ║      ║        ║
  ╠═══════╩══════╩════════╣
  ║                       ║
  ║        MERGED         ║
  ║                       ║
  ╚═══════════════════════╝

These 4 views are

LOCAL – this is file from the current branch

BASE – common ancestor, how file looked before both changes

REMOTE – file you are merging into your branch

MERGED – merge result, this is what gets saved in the repo

You can navigate among these views using ctrl+w. You can directly reach MERGED view using ctrl+w followed by j.

More information about vimdiff navigation is here and here.

Step 4. You could edit the MERGED view the following way

If you want to get changes from REMOTE

:diffg RE

If you want to get changes from BASE

:diffg BA

If you want to get changes from LOCAL

:diffg LO

Step 5. Save, Exit, Commit and Clean up

:wqa save and exit from vi

git commit -m "message"

git clean Remove extra files (e.g. *.orig) created by diff tool.

Related Posts:

  1. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  2. Resolve Git merge conflicts in favor of their changes during a pull
  3. What is the best (and safest) way to merge a Git branch into master?
  4. Undo a Git merge that hasn’t been pushed yet
  5. Git merge hotfix branch into feature branch
  6. Abort a Git Merge
  7. How can I merge multiple commits onto another branch as a single squashed commit?
  8. How can I merge multiple commits onto another branch as a single squashed commit?
  9. Why does git say “Pull is not possible because you have unmerged files”?
  10. The following untracked working tree files would be overwritten by merge, but I don’t care
  11. Why does git say “Pull is not possible because you have unmerged files”?
  12. The following untracked working tree files would be overwritten by merge, but I don’t care
  13. Is there a “theirs” version of “git merge -s ours”?
  14. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  15. The following untracked working tree files would be overwritten by merge, but I don’t care
  16. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  17. Is there a “theirs” version of “git merge -s ours”?
  18. Why does git say “Pull is not possible because you have unmerged files”?
  19. How to interactively (visually) resolve conflicts in SourceTree / git
  20. Is it possible to pull just one file in Git?
  21. How to resolve git status “Unmerged paths:”?
  22. How to keep a branch synchronized/updated with master?
  23. Found a swap file by the name
  24. Is there a git-merge –dry-run option?
  25. Git pull – Please move or remove them before you can merge
  26. How do I check out a remote Git branch?
  27. What does ‘–set-upstream’ do?
  28. What does ‘–set-upstream’ do?
  29. How to use Git Revert
  30. How do I properly force a Git push?
  31. How to remove local (untracked) files from the current Git working tree
  32. How to modify existing, unpushed commit messages?
  33. Git pushing to remote branch
  34. How to revert a merge commit that’s already pushed to remote branch?
  35. GitHub Error Message – Permission denied (publickey)
  36. How do I push a new local branch to a remote Git repository and track it too?
  37. How do you push a tag to a remote repository using Git?
  38. Remove files from Git commit
  39. How to solve SSL certificate: self signed certificate when cloning repo from github?
  40. Gitignore not working
  41. Could not open a connection to your authentication agent
  42. How to get just one file from another branch?
  43. How do I revert a Git repository to a previous commit?
  44. git checkout a single file from another branch and put in different folder
  45. Update Git branches from master
  46. How to revert multiple git commits?
  47. Stash only one file out of multiple files that have changed with Git?
  48. Create a branch in Git from another branch
  49. How do I fix a Git detached head?
  50. How can I git stash a specific file?
  51. Move the most recent commit(s) to a new branch with Git
  52. What does “Git push non-fast-forward updates were rejected” mean?
  53. How do I diff the same file between two different commits on the same branch?
  54. How to name and retrieve a stash by name in git?
  55. You have not concluded your merge (MERGE_HEAD exists)
  56. How to get the current branch name in Git?
  57. Stash just a single file
  58. Git – Ignore node_modules folder everywhere
  59. Meaning of the GitHub message: push declined due to email privacy restrictions
  60. Is there a command to undo git init?
  61. Download a single folder or directory from a GitHub repo
  62. Is there a “git touch” so I can push the same file with a new timestamp?
  63. Branch from a previous commit using Git
  64. How do I delete a local repository in git?
  65. Throw away local commits in Git
  66. Hard reset of a single file
  67. Hard reset of a single file
  68. How to remove remote origin from a Git repository
  69. Not a valid object name: ‘master’
  70. git add remote branch
  71. Undo a git stash
  72. Undo git stash pop that results in merge conflict
  73. Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
  74. Set up git to pull and push all branches
  75. Unity Collaborate vs GitHub
  76. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  77. SourceTree keeps asking for Github password
  78. Git’s local repository and remote repository — confusing concepts
  79. How to change the license for a project at Github?
  80. Git add all files modified, deleted, and untracked?
  81. How to switch back to ‘master’ with git?
  82. Github Authentication Failed – … GitHub does not provide shell access
  83. How do I pull files from remote without overwriting local files?
  84. How can I see which Git branches are tracking which remote / upstream branch?
  85. How to `git pull` while ignoring local changes?
  86. Your repository has no remotes configured to push to
  87. Uninitialize git repository
  88. Specify an SSH key for git push for a given domain
  89. How do I “un-revert” a reverted Git commit?
  90. How to create a local branch from an existing remote branch?
  91. git push not send changes to remote git repository
  92. How to merge a specific commit in Git
  93. What is the .git folder?
  94. How to use Git and Dropbox together?
  95. Git: Where exactly is the “working directory”?
  96. What exactly does the “u” do? “git push -u origin master” vs “git push origin master”
  97. Add latest commit info on login footer using login_footer hook
  98. WordPress Core files not being ignored by Git
  99. Display GitLab repositories of the logged in user on a page
  100. Full site editor, hard-coded IDs in query blocks, and staging/dev servers

Leave a Comment

tech