Craig Berntson
Craig is a Senior Software Engineer with Black Diamond Equipment and the Chief Software Gardener at Mojo Software Worx in Salt Lake City. He has a passion for community and helping other developers improve their skills. Craig has spoken at developer events across the US, Canada, and Europe and is the co-author of "Continuous Integration in .NET" available from Manning. Because of his community efforts, Craig has been named a Microsoft MVP every year since 1996. He is an INETA Community Speaker and a member of the ComponentOne Speaker Bureau.
Website URL: http://www.craigberntson.com
Branching and Merging are Bears, Oh My!
Branching code in your version control system is easy. Merging is a bear. Perhaps the solution is to not branch. In fact, in Continuous Integration, branching is an anti-pattern. In this session, we'll discuss different version control systems, when branching is ok, and techniques to avoid branching, which means avoiding merges.