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

Re: Should rerere auto-update a merge resolution?

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 25, 2017, 16:13 UTC
Message-ID
<xmqqo9r3tyl2.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<alpine.DEB.2.21.1.1708251218460.7424@virtualbox>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> In my hands, I need to tell rerere to forget, *and then recreate the merge
> conflict* before I can resolve it again and let rerere learn the new
> resolution.

I can believe that---that is how I originally desiged "forget" to behave.

Even though My quick tests to prepare a reply to Martin seemed to show that unmerging was not strictly needed in today's Git in order to forget and learn new, I wouldn't be surprised if an explicit unmerging in addition to "rerere forget" was necessary, especially if the original preimage were very different from the state before the botched resolution was applied.

Previous: Johannes SchindelinNext: Junio C Hamano
Message 5 of 8 in “Should rerere auto-update a merge resolution?”
  1. Martin LanghoffAug 23, 2017
  2. Junio C HamanoAug 23, 2017
  3. Martin LanghoffAug 23, 2017
  4. Johannes SchindelinAug 25, 2017
  5. Junio C HamanoAug 25, 2017
  6. Junio C HamanoAug 25, 2017
  7. Junio C HamanoAug 25, 2017
  8. Junio C HamanoAug 25, 2017

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.