Junio C Hamano <gitster@xxxxxxxxx> writes: > Sean Allred <allred.sean@xxxxxxxxx> writes: >> When outside the context of a conflict (no rebase/merge in progress), >> what's the intended workflow to clear out the contents of >> $GIT_DIR/rr-cache? > > You could "rm -fr .git/rr-cache/??*" if you want. Here's my reasoning for not wanting that: >> I'm wary of recommending `rm -rf "$(git rev-parse --git-dir)/rr-cache"` >> -- it's hard to describe this as anything but hacky when the rest of the >> experience is handled in porcelain. > The "intended" workflow is there will no need to "clear out" at all; > you may notice mistaken resolution, and you will remove it when you > notice one, but the bulk of the remaining database entries ought to > be still correct. When we noticed mistaken resolutions, rerere had already applied the recorded resolution and there was no apparent way to return to the conflicted state. If clearing out the rerere database was never an intended workflow here, maybe _that's_ my actual question? It seems likely this 'recovery' workflow should just be documented in git-rerere.txt (which I'm happy to take on once I learn what that workflow should be). -- Sean Allred
