There might come a time where you are landing in merge hell or any other of the 7 hellish GIT rebase/merge circles. rerere can really help you out here. reuse recorded resolution records, as the name says, how you solved a conflict and applies the resolutions every other time the conflict is encountered.
git config --global rerere.enabled 1
If you want to know more about it, visit http://git-scm.com/2010/03/08/rerere.html
This thing saves me time at least once a month.