Re: linux-next: stackprotector tree build failure
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/