Branches and Merges Are Bears, Oh My!

Branching and merging our code is one of the most fundamental things we do as developers. It’s also frequently one of the things that gives us the biggest headaches. It turns out that branching isn’t the pain point. It’s merging. But poor branching practices can make merging more painful. In this session you will many causes of poor branching and effective ways to make merges less painful. Whether you are using Git, TFS, Subversion, or something else, you will walk away will useful practices that you can start using right away.