Jay Soffian <jaysoffian@xxxxxxxxx> writes: > In fact, my first step after a conflicted merge is: > > $ git tag -f ours HEAD > $ git tag -f theirs MERGE_HEAD > $ git tag -f base $(git merge-base HEAD MERGE_HEAD) That looks like quite a convoluted set-up, I would think, than necessary. You only need to remember these: # what does the result look if I said "commit -a" now? $ git diff HEAD # I want to also see comparison with the original $ git checkout --conflict=diff3 <conflicted paths>... $ git diff # What did they do since they forked from my history? $ git diff ...MERGE_HEAD # What did I do since I forked from them? $ git diff MERGE_HEAD... # I want step-by-step explanation of how these paths were touched $ git log -p --left-right --merge [<conflicted paths>...] -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html