Hi, On Fri, 4 Jul 2008, Stephan Beyer wrote: > Johannes Schindelin wrote: > > > and you can easily abort a rebase if you explicitely asked for an > > invalid strategy. > > Aborting after fixing a lot of conflicts in the sequencer process is > really annoying. I think it should use rerere (if activated, which I have given up advocating to be the default). > So I've chosen to never abort automatically. Who said anything about automatically? Of _course_, the user has to abort it. Or try to continue with "git sequencer --continue -s ours". Ciao, Dscho -- 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
