Learn how to create separate branches for your code to marry up to your feature list (and then merge it all back into your master branch)
Learn how to deal with conflicts in binary files
In this article I demonstrate a few practical uses of using git hooks to make using git even better