Letting git resolve the same conflict with rerere
Have you ever needed to resolve the very same conflict over and over
again? It’s not only boring, but a waste of time to boot. Let git figure
it out! Add this line to your
gitconfig and you’re good to go!
[rerere] enabled = true