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

Re: rerere: how to remove an erroneous resolution?

From
Jeff King <peff@peff.net>
Date
Jan 26, 2009, 21:11 UTC
Message-ID
<20090126211140.GA28354@coredump.intra.peff.net>
In-Reply-To
<20090126151326.GA2618@neumann>
On Mon, Jan 26, 2009 at 04:13:26PM +0100, SZEDER Gábor wrote:
Show 11 quoted lines
> On Mon, Jan 26, 2009 at 03:42:39PM +0100, SZEDER Gábor wrote:
> > some time ago I mistakenly resolved a merge conflict incorrectly.  Of
> > course, rerere noted the erroneous conflict resolution, and whenever
> > the same merge conflict occurs rerere offers me that erroneous
> > conflict resolution, even though I correct it each time.
> > 
> > So, the question is how could I make rerere forget that particular
> > merge conflict resolution?  Is it at all possible?
> 
> Ok, I should have investigated a little longer before sending that
> email.

Hmm. I have never actually used rerere in a real setting, so I am somewhat clueless. But from your description, it sounds like it would make sense for it to update the resolution to the latest one used. If you changed it, it was probably to correct it; you would have no need to make a change to break an already-working resolution.

Then you would not have had to go mucking about in .git.
-Peff
Previous: SZEDER Gábor
Message 3 of 3 in “rerere: how to remove an erroneous resolution?”
  1. SZEDER GáborJan 26, 2009
  2. SZEDER GáborJan 26, 2009
  3. Jeff KingJan 26, 2009

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.