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

Re: [PATCH] rerere: demonstrate a weakness with identical conflicts in different files

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 11, 2010, 23:35 UTC
Message-ID
<7vmxssvi2t.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4C629495.60105@viscovery.net>

Hmm, my knee-jerk reaction was that something may be keying off of the conflict ids to keep track of which ones are dealt with and which ones are yet to be resolved, but I don't recall any part of the implementation that would do something like that offhand. Sorry.

Will try to find/make time to take a look at it later.
Previous: Johannes SixtNext: Junio C Hamano
Message 2 of 4 in “rerere: demonstrate a weakness with identical conflicts in different files”
  1. rerere: demonstrate a weakness with identical conflicts in different filesJohannes Sixt, Aug 11, 2010
  2. Junio C HamanoAug 11, 2010
  3. Junio C HamanoAug 12, 2010
  4. Johannes SixtAug 12, 2010

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.