{"thread":{"id":"28507","subject":"rerere with modified/deleted conflicts","startedAt":"2011-09-26T23:06:06Z","lastAt":"2011-09-26T23:23:31Z","messageCount":3,"participants":["Nicolas Pitre","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"176275","messageId":"alpine.LFD.2.00.1109261904340.2718@xanadu.home","threadId":"28507","inReplyTo":null,"subject":"rerere with modified/deleted conflicts","fromName":"Nicolas Pitre","fromEmail":"nico@fluxnic.net","sentAt":"2011-09-26T23:06:06Z","receivedAt":"2011-09-26T23:06:06Z","isPatch":false,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"Is this supported already?\n\n\nNicolas\n"},{"id":"176277","messageId":"7v62ke293f.fsf@alter.siamese.dyndns.org","threadId":"28507","inReplyTo":"alpine.LFD.2.00.1109261904340.2718@xanadu.home","subject":"Re: rerere with modified/deleted conflicts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-09-26T23:10:44Z","receivedAt":"2011-09-26T23:10:44Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nicolas Pitre <nico@fluxnic.net> writes:\n\n> Is this supported already?\n\nI do not think so, as rerere is about applying previous change using 3-way\nmerge. A modify/delete conflict would mean you have only two stages, and\nwhile I can see somebody might want to say \"I want to ignore further\nmodifications to this dead path ignored and resolve in favor of deletion\",\nit felt a bit too aggressive to my taste when I last worked on rerere.\n"},{"id":"176282","messageId":"alpine.LFD.2.00.1109261920000.2718@xanadu.home","threadId":"28507","inReplyTo":"7v62ke293f.fsf@alter.siamese.dyndns.org","subject":"Re: rerere with modified/deleted conflicts","fromName":"Nicolas Pitre","fromEmail":"nico@fluxnic.net","sentAt":"2011-09-26T23:23:31Z","receivedAt":"2011-09-26T23:23:31Z","isPatch":false,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"On Mon, 26 Sep 2011, Junio C Hamano wrote:\n\n> Nicolas Pitre <nico@fluxnic.net> writes:\n> \n> > Is this supported already?\n> \n> I do not think so, as rerere is about applying previous change using 3-way\n> merge. A modify/delete conflict would mean you have only two stages, and\n> while I can see somebody might want to say \"I want to ignore further\n> modifications to this dead path ignored and resolve in favor of deletion\",\n> it felt a bit too aggressive to my taste when I last worked on rerere.\n\nWell, that's exactly the use case we have here this would be nice for.  \nBut I wouldn't design it as \"ignore any further changes\" but rather \n\"ignore _this_ particular change to the file I want you to delete\".\n\n\nNicolas\n"}]}