git-rerere
Reuse recorded resolution of conflicted merges
TLDR
Enable rerere
$ git config rerere.enabled true
Show recorded resolutions$ git rerere status
Show diff of resolution$ git rerere diff
Clear recorded resolutions$ git rerere clear
Forget resolution$ git rerere forget [file]
SYNOPSIS
git rerere [command]
DESCRIPTION
git rerere (reuse recorded resolution) remembers how you resolved merge conflicts and automatically reapplies those resolutions in future merges. This is especially valuable during repeated merges and rebases.When enabled, Git records conflict resolutions. On subsequent merges with identical conflicts, the previous resolution is applied automatically, eliminating repetitive conflict resolution work.
PARAMETERS
status
Show paths with recorded resolutions.diff
Show diff for current resolutions.clear
Clear recorded resolutions.forget PATH
Forget resolution for path.gc
Prune old recordings.--help
Display help information.
CONFIGURATION
rerere.enabled
Set to `true` in git config to enable automatic recording of conflict resolutions.
INSTALL
sudo apt install git
sudo dnf install git
sudo pacman -S git
sudo apk add git
sudo zypper install git
brew install git
nix profile install nixpkgs#git
CAVEATS
Must be enabled in config. Records are local. May apply wrong resolution if contexts differ.
HISTORY
git rerere was added to Git to address the pain of resolving the same merge conflicts repeatedly, particularly during long-running branches and rebases.
SEE ALSO
git-merge(1), git-rebase(1)
