Menu
I need to present to the team what changes I've made during conflict resolution of a merge.
I know this is kind of hard, but I certainly believe it is possible somehow. I've tried already git show -m and git show -c.
439
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 .
Merge conflicts happen when you merge branches that have competing commits, and Git needs your help to decide which changes to incorporate in the final merge. Git can often resolve differences between branches and merge them automatically.
Look at the hash (or tag) of the merge commit (the commit that has multiple parents) and do:
git diff hash hash^1 hash^2
It will output a 3 way-diff of the changes.
hash^ (or hash^1) references the first parent commit of hashhash^2 references the second parent commit of hash
54
If you use the standard gitk tool, and click on a merge commit, the lower left pane shows the conflict resolutions.
33
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
