Using Git Rerere to Reuse Conflict Resolutions
Learn how Git's rerere feature records and replays conflict resolutions automatically during repeated rebases and merges.
What is Rerere?
Rerere stands for reuse recorded resolution. When enabled, Git remembers how you resolved a conflict and automatically reapplies the same resolution if it sees the identical conflict again.
Why Rerere Helps
During long-running rebases or repeated merges of the same branch, the same conflict can appear over and over. Rerere saves you from solving it by hand each time.
All lessons in this course
- Manual Merge Conflict Resolution
- Interactive Rebasing for History
- Cherry-picking Commits
- Using Git Rerere to Reuse Conflict Resolutions