"Git rerere", a bit of a hidden feature
a year ago
- #MergeConflicts
- #Git
- #VersionControl
- Git's rerere (reuse recorded resolution) feature allows automatic resolution of previously resolved merge conflicts.
- Enabling rerere globally can be done with `git config --global rerere.enabled true`.
- Rerere is useful for long-lived branches, frequent rebasing, and testing merges without cluttering history.
- Commands like `git rerere status` and `git rerere diff` help track and view conflict resolutions.
- Rerere can automatically resolve conflicts during rebase or merge if the same conflict was resolved before.