git rerere 仅手动解决

Question

git rerere 愉快地存储我的冲突解决方案，并在相同的冲突再次出现时自动应用它们。

但是，有时我会遇到与不同上下文的 merge 冲突，我不想自动 merge 。

有没有办法让 git rerere 记住冲突解决方案，但需要显式调用 git rerere 才能应用它们？

要明确一点，我不是在寻找 git rerere clear 或 git rerere forget，而是简单地说，不自动解析除非明确指示，否则 merge 冲突(如果它能在申请前向我显示建议的解决方案，则奖励!)

Answer 1

我不知道有什么方法可以不为特定的大块头应用 rerere。
您确实可以忘记文件的 rerere 分辨率 ( as discussed here )，但不仅仅是一个大块头。

您将不得不直接使用 .git/rr-cache，如 mentioned in this patch :

We record a previously seen conflict and its resolution in a subdirectory of $GIT_DIR/rr-cache, and the name of the subdirectory is computed by hashing the "shape" of the conflicted hunk.
When a similar-looking conflict is encountered later in the working tree, "git rerere" tries to replay the recorded resolution by running a three-way merge to apply the change to go from the previous conflict to the previous resolution to the current conflicted state.