Git Rerere & Conflict Resolution

Automate conflict resolution with git rerere and master advanced merge strategies.

Step 1 of 617%

git rerere (reuse recorded resolution) is a hidden gem that remembers how you resolved a merge conflict and automatically applies the same resolution next time. Combined with merge strategies and tools, it makes conflict handling almost painless.

Rerere is one of Git's most underappreciated features, and its odd name (pronounced 're-re-re') doesn't help. It stands for 'reuse recorded resolution' and works by recording conflict resolutions in a database. The next time Git encounters the exact same conflict — which happens frequently during rebase operations or when cherry-picking between branches — it applies your previous resolution automatically. This is especially powerful during long-lived feature branches that are repeatedly rebased on main: you resolve each conflict once, and rerere handles it on subsequent rebases.

1 / 6