threads / discuss / 28507

rerere with modified/deleted conflicts

Subject: rerere with modified/deleted conflicts

## tl;dr

3 messages between Sep 26, 2011 and Sep 26, 2011.

replies: 2people: 2as markdown or json

Junio C Hamano· Sep 26, 2011, 23:10 UTC · re: Nicolas Pitre · lore

Re: rerere with modified/deleted conflicts

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.

Nicolas Pitre· Sep 26, 2011, 23:23 UTC · re: Junio C Hamano · lore

Re: rerere with modified/deleted conflicts

On Mon, 26 Sep 2011, Junio C Hamano wrote:
Show 9 quoted lines
> 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.

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

← back to recent threads