{"thread":{"id":"38337","subject":"git rerere forget isn't working?","startedAt":"2015-01-12T14:20:27Z","lastAt":"2015-01-13T13:39:01Z","messageCount":3,"participants":["Robert Dailey","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"254552","messageId":"CAHd499C6opP_0RBGDS=h+1qhrr=7sD0w0hf_bpGWT-wPP4iJoQ@mail.gmail.com","threadId":"38337","inReplyTo":null,"subject":"git rerere forget isn't working?","fromName":"Robert Dailey","fromEmail":"rcdailey.lists@gmail.com","sentAt":"2015-01-12T14:20:27Z","receivedAt":"2015-01-12T14:20:27Z","isPatch":false,"sender":{"key":"rcdailey.lists@gmail.com","avatar":null},"body":"So I want a way to clear out the whole rerere cache (i.e. every\nremembered conflict resolution). So I try this command:\n\n$ git rerere forget .\n\nIt completes silently, I look at .git/rr-cache and there are still a\nbunch of SHA1 directories in there. So I guess it didn't work. The\nonly way I can do this is to physically delete the .git/rr-cache\ndirectory. I'd rather not do this, so is there a way to get this\ncommand to work properly? I'm using git 2.1.0 on Windows.\n"},{"id":"254553","messageId":"xmqq7fwrambo.fsf@gitster.dls.corp.google.com","threadId":"38337","inReplyTo":"CAHd499C6opP_0RBGDS=h+1qhrr=7sD0w0hf_bpGWT-wPP4iJoQ@mail.gmail.com","subject":"Re: git rerere forget isn't working?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-12T18:24:59Z","receivedAt":"2015-01-12T18:24:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Robert Dailey <rcdailey.lists@gmail.com> writes:\n\n> So I want a way to clear out the whole rerere cache (i.e. every\n> remembered conflict resolution). So I try this command:\n>\n> $ git rerere forget .\n\nThe forget subcommand is to tell Git that you screwed up in this\nsequence:\n\n    $ git merge other ;# or any \"mergy\" operation that leaves conflict\n    $ edit foo ;# help Git resolve conflicts\n    $ git rerere foo ;# and tell it to remember\n    ... and then later find that your earlier resolution was wrong\n    $ git rerere forget foo\n\nThe \"dot\" there may mean \"all paths\", but it is still \"all paths I\nresolved for this particular set of conflicts the \"mergy\" operation\nproduced.  There is no \"I do not care if there are good resolutions\nremembered that do not have anything to do with the current merge,\njust remove all of them\"---that is what \"rm -fr .git/rr-cache\" is\nfor.\n"},{"id":"254604","messageId":"CAHd499AS4q4wvSDAnaiZ9qo2C7Br3rmnrTBtDv-YgQn_=zJPnA@mail.gmail.com","threadId":"38337","inReplyTo":"xmqq7fwrambo.fsf@gitster.dls.corp.google.com","subject":"Re: git rerere forget isn't working?","fromName":"Robert Dailey","fromEmail":"rcdailey.lists@gmail.com","sentAt":"2015-01-13T13:39:01Z","receivedAt":"2015-01-13T13:39:01Z","isPatch":false,"sender":{"key":"rcdailey.lists@gmail.com","avatar":null},"body":"On Mon, Jan 12, 2015 at 12:24 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> Robert Dailey <rcdailey.lists@gmail.com> writes:\n>\n>> So I want a way to clear out the whole rerere cache (i.e. every\n>> remembered conflict resolution). So I try this command:\n>>\n>> $ git rerere forget .\n>\n> The forget subcommand is to tell Git that you screwed up in this\n> sequence:\n>\n>     $ git merge other ;# or any \"mergy\" operation that leaves conflict\n>     $ edit foo ;# help Git resolve conflicts\n>     $ git rerere foo ;# and tell it to remember\n>     ... and then later find that your earlier resolution was wrong\n>     $ git rerere forget foo\n>\n> The \"dot\" there may mean \"all paths\", but it is still \"all paths I\n> resolved for this particular set of conflicts the \"mergy\" operation\n> produced.  There is no \"I do not care if there are good resolutions\n> remembered that do not have anything to do with the current merge,\n> just remove all of them\"---that is what \"rm -fr .git/rr-cache\" is\n> for.\n\nSo to be clear, `rerere forget` is for use prior to `merge --abort`\nthen? I have the global config option set to make rebase and merge\nautomatically record to rr cache (forgetting the name ATM but you\nshould know what I'm talking about). I didn't see it documented that\nit's safe/recommended to manually delete rr-cache directory, so I\nwasn't sure if that was a valid solution.\n\nThanks for the information it has been helpful.\n"}]}