Setup Git merge for automatic resolving

git rerere
Recorded Reused Resolution

Enabling rerere
git config --global rerere.autoupdate true


Comments