How do you manage development when two or more people (or teams) are making major incompatible changes at the same time? The answer is to create branches in your version control repository, but that can go sour in many ways. If you’d like some advice on how to do it right, check out: