João Santana, one of the illustrious ThoughtWorks consultants I’ve had the pleasure to work with, recommended this link:

Most common git screwups/questions and solutions

I was looking to learn a bit more about the parts of git I’ve not ventured into yet. What better way that looking the most common ways people screw them up and how to fix the resulting problems! Here’s a short list, compiled from my own experience and issues I’ve come across on the Internet.