On Tue, Jul 29, 2008 at 14:36, Jeff King <peff@xxxxxxxx> wrote: <good explanation of what I meant snipped> > If you are using "-s theirs" frequently, you are probably doing > something wrong. But that doesn't mean it is wrong for it to exist. Exactly, thank you for that :). I hope it is clear to everybody what I meant now, although it seems that especially Junio and Dscho feel 'git-merge-theirs' should not be part of git in the suggested form. -- Cheers, Sverre Rabbelier -- 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
