git-rerere

Enable rerere

$ git config rerere.enabled true

$ git rerere status

$ git rerere diff

$ git rerere clear

$ git rerere forget [file]

git rerere [command]

git rerere (reuse recorded resolution) remembers how you resolved merge conflicts and automatically reapplies those resolutions in future merges. This is especially valuable during repeated merges and rebases.
When enabled, Git records conflict resolutions. On subsequent merges with identical conflicts, the previous resolution is applied automatically, eliminating repetitive conflict resolution work.

status

Show paths with recorded resolutions.

Show diff for current resolutions.

Clear recorded resolutions.

Forget resolution for path.

Prune old recordings.

Display help information.

rerere.enabled

Set to `true` in git config to enable automatic recording of conflict resolutions.

Must be enabled in config. Records are local. May apply wrong resolution if contexts differ.

git rerere was added to Git to address the pain of resolving the same merge conflicts repeatedly, particularly during long-running branches and rebases.

git-merge(1), git-rebase(1)