Menu
How can I find out if there were conflicts when merging a branch and what shenanigans did the person have to do to resolve those conflicts?
git log -p seems to show empty diffs for all merge commits, regardless whether they have manual changes or not.
678
To see the beginning of the merge conflict in your file, search the file for the conflict marker <<<<<<< . When you open the file in your text editor, you'll see the changes from the HEAD or base branch after the line <<<<<<< HEAD .
1 answer. You just need to check the length of the `parents`. If there are two or more commits, it's a merge commit, otherwise it's a regular commit.
git show produces a combined diff for a merge commit by default, which will contain only the lines that changed as part of the conflict resolution.
git show <merge_commit_sha1>
git log takes the --cc option to produce combined diffs for merge commits. For example, to find all merge commits with manual changes you can use:
git log -p --cc --min-parents=2
and look for commits with diffs.
182
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With