[Griffinsauce]

If you're rebasing a lot, definitely set up rerere (reuse recorded solution) - it improves things enormously.

Do make sure you know how to reset the cache, in case you did a bad conflict resolution because it will keep biting you. Besides that caveat it's a must.