From: "SZEDER Gábor" <szeder@ira.uka.de>
To: git@vger.kernel.org
Subject: Re: rerere: how to remove an erroneous resolution?
Date: Mon, 26 Jan 2009 16:13:26 +0100 [thread overview]
Message-ID: <20090126151326.GA2618@neumann> (raw)
In-Reply-To: <20090126144239.GA494@neumann>
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.
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
next prev parent reply other threads:[~2009-01-26 15:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-26 14:42 rerere: how to remove an erroneous resolution? SZEDER Gábor
2009-01-26 15:13 ` SZEDER Gábor [this message]
2009-01-26 21:11 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090126151326.GA2618@neumann \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).