# rerere with modified/deleted conflicts 3 messages from 2011-09-26 to 2011-09-26. Participants: Nicolas Pitre, Junio C Hamano. Thread: https://gitlist.dev/t/28507 ## Nicolas Pitre, 2011-09-26 23:06 Subject: rerere with modified/deleted conflicts Message-ID: URL: https://gitlist.dev/e/alpine.LFD.2.00.1109261904340.2718%40xanadu.home ``` Is this supported already? Nicolas ``` ## Junio C Hamano, 2011-09-26 23:10 Subject: Re: rerere with modified/deleted conflicts Message-ID: <7v62ke293f.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v62ke293f.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Nicolas Pitre 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. ``` ## Nicolas Pitre, 2011-09-26 23:23 Subject: Re: rerere with modified/deleted conflicts Message-ID: URL: https://gitlist.dev/e/alpine.LFD.2.00.1109261920000.2718%40xanadu.home In-Reply-To: <7v62ke293f.fsf@alter.siamese.dyndns.org> ``` On Mon, 26 Sep 2011, Junio C Hamano wrote: > Nicolas Pitre 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 ```