Git Merge and Rebase. Plus Interactive Rebasing and Why It's Not So Scary.

od Web Dev with Matt