From: Nicolas Pitre <nico@fluxnic.net>
Date: Mon, 26 Sep 2011 23:23:31 GMT
Subject: Re: rerere with modified/deleted conflicts
Message-ID: <alpine.LFD.2.00.1109261920000.2718@xanadu.home>
In-Reply-To: <7v62ke293f.fsf@alter.siamese.dyndns.org>

On Mon, 26 Sep 2011, Junio C Hamano wrote:

> Nicolas Pitre <nico@fluxnic.net> writes:
> 
> > Is this supported already?
> 
> I do not think so, as rerere is about applying previous change using 3-way
> merge. A modify/delete conflict would mean you have only two stages, and
> while I can see somebody might want to say "I want to ignore further
> modifications to this dead path ignored and resolve in favor of deletion",
> it felt a bit too aggressive to my taste when I last worked on rerere.

Well, that's exactly the use case we have here this would be nice for.  
But I wouldn't design it as "ignore any further changes" but rather 
"ignore _this_ particular change to the file I want you to delete".


Nicolas