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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
