On Fri, May 06, 2011 at 08:40:04PM +0200, Matthieu Moy wrote:
> Pierre Habouzit <madcoder@xxxxxxxxxx> writes:
>
> > + const char * const merge_advice =
> > + _("use \"git reset --hard\" to abort, or resolve conflicts and commit");
>
> I think that should be "git reset --merge" (which preserves files not
> touched by the merge, and makes sure "git merge; git reset" doesn't
> permanently loose data).
Wow, I didn't know about that one, so /maybe/ the hint isn't that
useless after all :)
--
ÂOÂ Pierre Habouzit
ÂÂO madcoder@xxxxxxxxxx
OOO http://www.madism.org
--
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