git rerere

all

Reuse fixes for merge conflicts.

Examples (3)

Enable rerere globally

git config --global rerere.enabled true

Forget a file's recorded resolution

git rerere forget path/to/file

Check the status of recorded resolutions

git rerere status

made by @shridhargupta | data from tldr-pages