Is there a way to preview exactly what a git merge will do?

git diff shows me the difference between two commits, but I don't know
every time which difference will win.

Anyone else experience this?  I'll look for a concrete example if
you'd like.
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to
To unsubscribe from this group, send email to
For more options, visit this group at

Reply via email to