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

/ Web Dev with Matt