Git Rerere

There might come a time when you’re landing in merge hell (or any of the 7 hellish GIT rebase/merge circles). rerere can really help you out by reusing recorded resolution records—how you solved a conflict—and applying the same resolutions every time the conflict is encountered.

Enable it globally:

git config --global rerere.enabled 1

You can learn more on the official Git site: http://git-scm.com/2010/03/08/rerere.html