How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

by

If you know the ref, then git show <MERGE_COMMIT> will show you the resolution done (if any) for the merge commit.

For log, use git log -p -c or git log -p --cc. From the manpage of git log:

   -c
       With this option, diff output for a merge commit shows the differences from each 
       of the parents to the merge result simultaneously instead of showing pairwise 
       diff between a parent and the result one at a time. Furthermore, it lists only 
       files which were modified from all parents.

   --cc
       This flag implies the -c option and further compresses the patch output by 
       omitting uninteresting hunks whose contents in the parents have only two 
       variants and the merge result picks one of them without modification.

More Related Contents:

  1. Git – how to force merge conflict and manual merge on selected file
  2. How does ‘git merge’ work in details?
  3. How to replace master branch in Git, entirely, from another branch? [duplicate]
  4. How do you merge two Git repositories?
  5. How to merge a specific commit in Git
  6. How to import existing Git repository into another?
  7. Git cherry pick and datamodel integrity
  8. Updates were rejected because the remote contains work that you do not have locally
  9. git rebase, keeping track of ‘local’ and ‘remote’
  10. Is it possible for git-merge to ignore line-ending differences?
  11. Merging: Hg/Git vs. SVN
  12. What is the precise meaning of “ours” and “theirs” in git?
  13. git cherry-pick says “…38c74d is a merge but no -m option was given”
  14. Git – Ignore files during merge
  15. Trying To Understand/Determine A Basic Git Workflow
  16. Pull a certain branch from the remote server
  17. git rebase and git push: non-fast forward, why use?
  18. Disable Git Rename Detection
  19. git partial merge, not whole branch
  20. Simple tool to ‘accept theirs’ or ‘accept mine’ on a whole file using git
  21. How can I get the parents of a merge commit in Git?
  22. How to merge two branches without a common ancestor?
  23. Git: merging public and private branches while while keeping certain files intact in both branches
  24. How would I write a pre-merge hook in Git?
  25. Are there any downsides to enabling git rerere?
  26. Reverting a git merge while allowing for the same merge later)
  27. git: merge two branches: what direction?
  28. Git: How to create patches for a merge?
  29. git: How do I add a custom merge strategy?
  30. git merging branches in a bare repository

Leave a Comment