When a merge makes a mess, git offers, from "git mergetool", vimdiff.
Is there an easy way to select one of the hunks at each point? (generally, what
I'm looking for is usually the right option, corresponding to after the '====',
and tagged as "REMOTE".)
Entertaining minecraft videos
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.