It should also be mentioned that if you are going to be doing some rebasing that you should look into enabling git rerere. What isn't mentioned in his article if you do multiple rebases to the same branch you will have to resolve the same conflicts over and over without rerere enabled.
