* rerere: how to remove an erroneous resolution?
@ 2009-01-26 14:42 SZEDER Gábor
2009-01-26 15:13 ` SZEDER Gábor
0 siblings, 1 reply; 3+ messages in thread
From: SZEDER Gábor @ 2009-01-26 14:42 UTC (permalink / raw)
To: git
Hi,
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?
Thanks,
Gábor
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: rerere: how to remove an erroneous resolution?
2009-01-26 14:42 rerere: how to remove an erroneous resolution? SZEDER Gábor
@ 2009-01-26 15:13 ` SZEDER Gábor
2009-01-26 21:11 ` Jeff King
0 siblings, 1 reply; 3+ messages in thread
From: SZEDER Gábor @ 2009-01-26 15:13 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: rerere: how to remove an erroneous resolution?
2009-01-26 15:13 ` SZEDER Gábor
@ 2009-01-26 21:11 ` Jeff King
0 siblings, 0 replies; 3+ messages in thread
From: Jeff King @ 2009-01-26 21:11 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git
On Mon, Jan 26, 2009 at 04:13:26PM +0100, SZEDER Gábor wrote:
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-01-26 21:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-26 14:42 rerere: how to remove an erroneous resolution? SZEDER Gábor
2009-01-26 15:13 ` SZEDER Gábor
2009-01-26 21:11 ` Jeff King
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).