Difficult merges in git - don't panic!
Andy Balaam takes you through what merging is, what rebasing is, and the stuff you need to understand to make you able to do merges without panicking and pressing buttons until the errors go away.
Slides and more info on the blog: http://www.artificialworlds.net/blog/...