git-rerere
Undo a git rerere resolution that was done in a rebase
To simply remove all previous rerere resolutions, run rm -rf .git/rr-cache to remove the cache. For a specific merge, you can tell rerere to forget the recorded resolution by re-executing the merge and allowing rerere to apply its recorded resolution in the work tree. You can check out a’ and then do a git merge … Read more
Are there any downsides to enabling git rerere?
If you do a merge incorrectly, then discard it, then do the “same” merge again, it will be incorrect again. You can forget a recorded resolution, though. From the documentation: git rerere forget <pathspec> This resets the conflict resolutions which rerere has recorded for the current conflict in <pathspec>. Be careful to use it on … Read more