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

Re: rerere: how to remove an erroneous resolution?

From
SZEDER Gábor <szeder@ira.uka.de>
Date
Jan 26, 2009, 15:13 UTC
Message-ID
<20090126151326.GA2618@neumann>
In-Reply-To
<20090126144239.GA494@neumann>
On Mon, Jan 26, 2009 at 03:42:39PM +0100, SZEDER Gábor wrote:
Show 7 quoted lines
> 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.

I thought that .git/rr-cache contains some kind of sha1-named objects, and did not realize that those are indeed directories with just plaintext pre- and postimage files in it. So, after some grepping I could identify the sought conflict resolution fairly easily, and correct it.

Best, Gábor

Previous: SZEDER GáborNext: Jeff King
Message 2 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.