How do I check if a merge transaction contains manual changes (e.g. conflicts resolved)?
How can I find out if there were conflicts when merging a branch and what shenanigans the person did to resolve these conflicts?
git log -p
seems to show empty differences for all merge commits, whether they have manual changes or not.
+3
Eugene yarmash
source
to share
1 answer
git show
creates a combined diff for the default merge commit, which will only contain lines that have changed as part of the conflict resolution.
git show <merge_commit_sha1>
git log
takes a parameter --cc
to create combined diffs for the merge commands. For example, to find all merges with manual changes, you can use:
git log -p --cc --min-parents=2
and find commits with diff.
+5
Eugene yarmash
source
to share