From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 18 Jan 2019 21:03:58 GMT
Subject: Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
Message-ID: <nycvar.QRO.7.76.6.1901182203350.41@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqmunxluj8.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Fri, 18 Jan 2019, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > I am about to submit a new iteration of my patch series, would it be too
> > much trouble for you to rebase on top? If it would be, let me know, then I
> > will rebase on top of yours.
> 
> Or both of you keep the topics as-is and self-consistent, and let
> the rerere machinery to squash it in when the two topics gets
> merged.

With all the experience I have with rerere, I don't trust it.

Ciao,
Johannes