Re: [PATCH] builtin-rerere: fix conflict markers parsing

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 7, 2008, 15:29 UTC
Message-ID: <alpine.DEB.1.00.0807071627020.18205@racer>
In-Reply-To: <48722BD9.4090406@free.fr>

Hi,

On Mon, 7 Jul 2008, Olivier Marin wrote:

Show 6 quoted lines

> Johannes Schindelin a écrit :
> > 
> > Okay, but then the obvious question is: what do you do about "<<<<<<" 
> > lines that are not a marker?
> 
> The answer is the same.

I think not. You say you want to do something about the ambiguity, but fact is: the conflict markers are ambiguous. They always have been, will ever be, and I do not even have to argue for it. Or do I?

> > Same remark as before: if you fix rerere, why not do it properly?
> 
> If you have a better fix send a patch or at least give me some clues.

Did I not say that the index has enough information? Or at least hint at it?

Of course, we could run with your solution. But that only fixes a corner case, right?

So a proper fix will be needed eventually anyway.

And no, I will not work on it: this is not my itch, and my time is being stolen too much already, these days.

Ciao, Dscho