These are some commands/configs that I ddin't know or haven't used a lot at the time of writing this gist but find them valuable to incorporate in my daily life
git config --global rerere.enabled
Solve the same conflict automatically the next time it comes up
There is a 4th secret option: