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. 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.