Michael Kaufmann on Twitter: "#GitVent #8: Did you know? You can record resolution of merge conflicts with git rerere (Reuse Recorded Resolution) $ git config --global rerere.enabled true With auto update the
Git - Rerere
Git之深入解析Rerere重用记录的解决方案-伙伴云
Fix conflicts only once with git rerere | by Christophe Porteneuve | Medium
The Git Rerere Command — Automate Solutions to Fix Merge Conflicts | by Minh Pham | Level Up Coding
The Git Rerere Command — Automate Solutions to Fix Merge Conflicts | by Minh Pham | Level Up Coding
Git rerere
Rerere your boat... A nice hidden git feature to "reuse recorded resolutions”. : r/git