From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Sep 2011 23:10:44 GMT
Subject: Re: rerere with modified/deleted conflicts
Message-ID: <7v62ke293f.fsf@alter.siamese.dyndns.org>
In-Reply-To: <alpine.LFD.2.00.1109261904340.2718@xanadu.home>

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.