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. -- 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