How do you detect an evil merge in git?

by

The easiest thing to do would be to diff the results of your conflict resolution with a merge that auto-resolves conflicts without human intervention. Any automatic resolutions will be ignored, since they will be resolved in exactly the same way.

I see two ways of visualizing the possible “evil” resolutions. If you are making this into a script add &> /dev/null to the end of all lines that you do not care to see output.

1) Use two separate diffs, one that favors the first parent, and a second that favors the second parent.

MERGE_COMMIT=<Merge Commit>
git checkout $MERGE_COMMIT~
git merge --no-ff --no-edit -s recursive -Xours $MERGE_COMMIT^2
echo "Favor ours"
git diff HEAD..$MERGE_COMMIT
git checkout $MERGE_COMMIT~
git merge --no-ff --no-edit -s recursive -Xtheirs $MERGE_COMMIT^2
echo "Favor theirs"
git diff HEAD..$MERGE_COMMIT

2) Diff against the results of the conflicted merge with the conflicts still in.

MERGE_COMMIT=<Merge Commit>
git checkout $MERGE_COMMIT~
git -c merge.conflictstyle=diff3 merge --no-ff $MERGE_COMMIT^2 --no-commit
git add $(git status -s | cut -c 3-)
git commit --no-edit
git diff HEAD..$MERGE_COMMIT

More Related Contents:

  1. Undo a Git merge that hasn’t been pushed yet
  2. I ran into a merge conflict. How can I abort the merge?
  3. What is the best (and safest) way to merge a Git branch into master?
  4. Is there a “theirs” version of “git merge -s ours”?
  5. How can I merge multiple commits onto another branch as a single squashed commit?
  6. Merge, update, and pull Git branches without using checkouts
  7. Re-doing a reverted merge in Git
  8. Is there a git-merge –dry-run option?
  9. When would you use the different git merge strategies?
  10. What’s the difference between ‘git merge’ and ‘git rebase’?
  11. How do I safely merge a Git branch into master?
  12. I ran into a merge conflict. How do I abort the merge?
  13. What’s the simplest way to list conflicted files in Git?
  14. Git merge hotfix branch into feature branch
  15. Get changes from master into branch in Git
  16. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  17. Git merge error “commit is not possible because you have unmerged files”
  18. Find unmerged Git branches?
  19. how can I customize git’s merge commit message?
  20. error: Your local changes to the following files would be overwritten by checkout
  21. How do I fix a merge conflict due to removal of a file in a branch?
  22. Tell git not to merge binary files but to choose
  23. How to keep a branch synchronized/updated with master?
  24. How to merge specific files from Git branches
  25. git: merge two branches: what direction?
  26. How to see commits that were merged in to a merge commit?
  27. Merge, update, and pull Git branches without using checkouts
  28. Git: Merge a Commit into a different Branch
  29. Telling if a Git commit is a Merge/Revert commit
  30. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?

Leave a Comment