git rerere
Reuse fixes for merge conflicts. More information: https://git-scm.com/docs/git-rerere.
- Enable rerere globally:
git config --global rerere.enabled true
- Forget a file's recorded resolution:
git rerere forget
- Check the status of recorded resolutions:
git rerere status
来源:tldr-pages contributors · 作者与贡献记录 · CC BY 4.0。离线整理了版式、链接和媒体显示。
