Jay Soffian <jaysoffian@xxxxxxxxx> writes: >> Â# what does the result look if I said "commit -a" now? >> Â$ git diff HEAD > > I never use commit -a. Well I said 'commit -a' only so that any newbie can understand what I meant, and certainly didn't mean to suggest you to use 'commit -a'. You can rephrase it as: "Now I _think_ I have good state in my working tree; what is the change since HEAD, i.e. the result of the merge?". >> Â# I want to also see comparison with the original >> Â$ git checkout --conflict=diff3 <conflicted paths>... >> Â$ git diff > > I have merge.conflictstyle diff3 in my .gitconfig. Good for you. > ... > Now that's one I haven't used before. Surely there is room for everybody to learn something every day ;-). -- 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