Intermediate LevelGit & GitHub
What is git rerere (Reuse Recorded Resolution) and how does it automate conflict resolution?
❓ Interview Prompt: Explain git rerere configuration, recording conflict resolutions, and automatically resolving repeated merge conflicts during rebases.
git rerere (Reuse Recorded Resolution) remembers how you manually resolved a merge conflict hunk in .git/rr-cache/. If Git encounters the identical conflict again during rebases, it applies your previous resolution automatically.
Code Implementation Example
bash
git config --global rerere.enabled true💡Enabling git rerere for automated conflict resolution reuse.
🎯 Interview Key Takeaway
Enable git rerere to let Git record and automatically re-apply identical merge conflict resolutions during rebases.
#git rerere#Merge Conflicts#Automation#Intermediate
Back to all Git & GitHub Questions→