On Mon, 26 Sep 2011, Junio C Hamano wrote: > Nicolas Pitre <nico@xxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html