{"thread":{"id":"17373","subject":"rerere: how to remove an erroneous resolution?","startedAt":"2009-01-26T14:42:39Z","lastAt":"2009-01-26T21:11:40Z","messageCount":3,"participants":["SZEDER Gábor","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"101989","messageId":"20090126144239.GA494@neumann","threadId":"17373","inReplyTo":null,"subject":"rerere: how to remove an erroneous resolution?","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2009-01-26T14:42:39Z","receivedAt":"2009-01-26T14:42:39Z","isPatch":false,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Hi,\n\nsome time ago I mistakenly resolved a merge conflict incorrectly.  Of\ncourse, rerere noted the erroneous conflict resolution, and whenever\nthe same merge conflict occurs rerere offers me that erroneous\nconflict resolution, even though I correct it each time.\n\nSo, the question is how could I make rerere forget that particular\nmerge conflict resolution?  Is it at all possible?\n\n\nThanks,\nGábor\n"},{"id":"101990","messageId":"20090126151326.GA2618@neumann","threadId":"17373","inReplyTo":"20090126144239.GA494@neumann","subject":"Re: rerere: how to remove an erroneous resolution?","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2009-01-26T15:13:26Z","receivedAt":"2009-01-26T15:13:26Z","isPatch":false,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"On Mon, Jan 26, 2009 at 03:42:39PM +0100, SZEDER Gábor wrote:\n> some time ago I mistakenly resolved a merge conflict incorrectly.  Of\n> course, rerere noted the erroneous conflict resolution, and whenever\n> the same merge conflict occurs rerere offers me that erroneous\n> conflict resolution, even though I correct it each time.\n> \n> So, the question is how could I make rerere forget that particular\n> merge conflict resolution?  Is it at all possible?\n\nOk, I should have investigated a little longer before sending that\nemail.\n\nI thought that .git/rr-cache contains some kind of sha1-named objects,\nand did not realize that those are indeed directories with just\nplaintext pre- and postimage files in it.  So, after some grepping I\ncould identify the sought conflict resolution fairly easily, and\ncorrect it.\n\nBest,\nGábor\n"},{"id":"102051","messageId":"20090126211140.GA28354@coredump.intra.peff.net","threadId":"17373","inReplyTo":"20090126151326.GA2618@neumann","subject":"Re: rerere: how to remove an erroneous resolution?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-01-26T21:11:40Z","receivedAt":"2009-01-26T21:11:40Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jan 26, 2009 at 04:13:26PM +0100, SZEDER Gábor wrote:\n\n> On Mon, Jan 26, 2009 at 03:42:39PM +0100, SZEDER Gábor wrote:\n> > some time ago I mistakenly resolved a merge conflict incorrectly.  Of\n> > course, rerere noted the erroneous conflict resolution, and whenever\n> > the same merge conflict occurs rerere offers me that erroneous\n> > conflict resolution, even though I correct it each time.\n> > \n> > So, the question is how could I make rerere forget that particular\n> > merge conflict resolution?  Is it at all possible?\n> \n> Ok, I should have investigated a little longer before sending that\n> email.\n\nHmm. I have never actually used rerere in a real setting, so I am\nsomewhat clueless. But from your description, it sounds like it would\nmake sense for it to update the resolution to the latest one used. If\nyou changed it, it was probably to correct it; you would have no need to\nmake a change to break an already-working resolution.\n\nThen you would not have had to go mucking about in .git.\n\n-Peff\n"}]}