Going Backwards to Go Forwards

I worked on an interesting problem this week that might have looked like I was running around in circles if you just looked at my SVN commits. The problem, and the eventual solution, reminded me of an important part of software development—of building anything really. Sometimes you must tear it down! No really, sometimes you build a structure only to …

branching strategy

Simple Branching Strategy Part 1: Back to Basics

Source control management has always been one of those sticky topics which always causes many questions.  Many veteran programmers are baffled by the in-and-outs of branching and merging.  And for good reason; it is a difficult topic. I’ve been around in many different organizations.  I’ve been the person who was told what the SCM strategy was, and I have been …

devcave1.jpg

Merge Code In… Merge Code Out…

Merging is source control Kung-Fu. I’ve seen many people get taken to the mat when trying to merge code.  Today, I’m going to give you a simple technique that can help save you the embarrassment of your favorite source control program kicking you right in the head. Bring the plate to the food Often as a kid the table would …