git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: rerere with modified/deleted conflicts

From
Nicolas Pitre <nico@fluxnic.net>
Date
Sep 26, 2011, 23:23 UTC
Message-ID
<alpine.LFD.2.00.1109261920000.2718@xanadu.home>
In-Reply-To
<7v62ke293f.fsf@alter.siamese.dyndns.org>
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
Previous: Junio C Hamano
Message 3 of 3 in “rerere with modified/deleted conflicts”
  1. Nicolas PitreSep 26, 2011
  2. Junio C HamanoSep 26, 2011
  3. Nicolas PitreSep 26, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.