* rerere with modified/deleted conflicts
@ 2011-09-26 23:06 Nicolas Pitre
2011-09-26 23:10 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Pitre @ 2011-09-26 23:06 UTC (permalink / raw)
To: git
Is this supported already?
Nicolas
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: rerere with modified/deleted conflicts
2011-09-26 23:06 rerere with modified/deleted conflicts Nicolas Pitre
@ 2011-09-26 23:10 ` Junio C Hamano
2011-09-26 23:23 ` Nicolas Pitre
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2011-09-26 23:10 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: rerere with modified/deleted conflicts
2011-09-26 23:10 ` Junio C Hamano
@ 2011-09-26 23:23 ` Nicolas Pitre
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Pitre @ 2011-09-26 23:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Mon, 26 Sep 2011, Junio C Hamano wrote:
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-26 23:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-26 23:06 rerere with modified/deleted conflicts Nicolas Pitre
2011-09-26 23:10 ` Junio C Hamano
2011-09-26 23:23 ` Nicolas Pitre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox