From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 04 Jul 2008 01:11:51 GMT
Subject: Re: [RFC/PATCH 1/4] Add git-sequencer shell prototype
Message-ID: <alpine.DEB.1.00.0807040309580.2849@eeepc-johanness>
In-Reply-To: <20080704010616.GH6677@leksak.fem-net>

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