On Mon, Jan 12, 2015 at 12:24 PM, Junio C Hamano <gits...@pobox.com> wrote: > Robert Dailey <rcdailey.li...@gmail.com> writes: > >> So I want a way to clear out the whole rerere cache (i.e. every >> remembered conflict resolution). So I try this command: >> >> $ git rerere forget . > > The forget subcommand is to tell Git that you screwed up in this > sequence: > > $ git merge other ;# or any "mergy" operation that leaves conflict > $ edit foo ;# help Git resolve conflicts > $ git rerere foo ;# and tell it to remember > ... and then later find that your earlier resolution was wrong > $ git rerere forget foo > > The "dot" there may mean "all paths", but it is still "all paths I > resolved for this particular set of conflicts the "mergy" operation > produced. There is no "I do not care if there are good resolutions > remembered that do not have anything to do with the current merge, > just remove all of them"---that is what "rm -fr .git/rr-cache" is > for.
So to be clear, `rerere forget` is for use prior to `merge --abort` then? I have the global config option set to make rebase and merge automatically record to rr cache (forgetting the name ATM but you should know what I'm talking about). I didn't see it documented that it's safe/recommended to manually delete rr-cache directory, so I wasn't sure if that was a valid solution. Thanks for the information it has been helpful. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
