Git Rerere (Reuse Recorded Resolution)

Rerere fingerprints conflict hunks + resolutions. On any later merge/rebase/cherry-pick producing the same conflict, Git auto-applies the stored fix.

Enable

git config --global rerere.enabled true
git config --global rerere.autoupdate true   # also stage auto-resolved files

Storage: .git/rr-cache/<hash>/{preimage,postimage}. Local, not pushed.

Commands