As a developer dealing with recurring merge conflicts, I want to understand git rerere so that I can let Git automatically resolve conflicts it has seen before.
What
Add content covering git rerere (reuse recorded resolution) — how it records conflict resolutions and replays them automatically on future occurrences.
Why
Rerere is underused but powerful for long-lived branches and repeated rebases. It fits naturally in the expert topics or playbook chapter.
Acceptance criteria
As a developer dealing with recurring merge conflicts, I want to understand
git rerereso that I can let Git automatically resolve conflicts it has seen before.What
Add content covering
git rerere(reuse recorded resolution) — how it records conflict resolutions and replays them automatically on future occurrences.Why
Rerere is underused but powerful for long-lived branches and repeated rebases. It fits naturally in the expert topics or playbook chapter.
Acceptance criteria
rerere.enabled = true)git rerere forgetfor clearing bad resolutions