The company I work for (youDevise) hosted the Stackoverflow meetup the other week. I got to meet a few people, eat, some pizza, and play a game on a Kinect. The evening ended with a discussion about the branching and merging capabilities of git versus those of subversion. Rather than us simply talking about the differences and probably getting many of them wrong, one of the guys challenged me to try out the scenarios we had been discussing and write up a post about it. This is the result.