Stop repeating yourself (rerere)

rerere stores your conflict (merge?) resolutions, so you won't have to redo the same thing over and over. It's off by default.

$ git config --global rerere.enabled 1