>

Reuse Conflict Resolutions With rerere

Record how you resolved a conflict and apply it again automatically.

macOSautomationgitcliLow risk
Run git config rerere.enabled true to start recording and replaying resolutions.

01Command

Command
$ git config rerere.enabled true

02What it does

When a branch is rebased repeatedly, the same conflicts recur; rerere remembers each resolution and applies it next time, saving substantial manual work. It is an automation feature that lives naturally in a terminal workflow.

03Risk

RiskLow risk
RequirementsGit 2.20+ (install with Homebrew or Xcode Command Line Tools)
CompatibilitymacOS with Git installed (Homebrew or Xcode Command Line Tools)
!Warning: An automatic resolution can be wrong if context changed; review replayed hunks before committing.

04Undo

✓No undo needed — this command does not change persistent state.

05Sources

  • git-rerere documentation
    Git · vendor-doc · 2026-09-20
    Evidence: Documents rerere, which records conflict resolutions and reuses them.

Last verified: 2026-10-13 · Category: Developer