I was searching for a walk through of a bit of a screwy merge I have to do in a Git repo tonight, when I came across these videos by David Mahler.  It wasn’t what I needed, but this is one of the best explanations of the core Git (and revision control) concepts for a beginner.

If you’re just learning Git, or looking for a refresher, check these out.