From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Oct 2008 23:54:54 GMT
Subject: Re: linux-next: stackprotector tree build failure
Message-ID: <20081023105454.880e13e2.sfr@canb.auug.org.au>
In-Reply-To: <alpine.DEB.1.00.0810221908100.22125@pacific.mpi-cbg.de.mpi-cbg.de>

Hi Johannes,

On Wed, 22 Oct 2008 19:41:18 +0200 (CEST) Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>
> I think it might be in order to explain how git-rerere works internally:

Thanks for the explanation.

> So I think that you might hit the unfortunate case where two files 
> happened to have the same conflicts, but you needed to resolve them one 
> way for one file, and another way for the other file.

Which makes perfect sense, unfortunately.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/