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