With distributed version control, merges are easy and work fine. So you can actually have a stable branch and a development branch, or create long-lived branches for your QA team where they test things before deployment, or you can create short-lived branches to try out new ideas and see how they work. This is too important to miss out on. This is possibly the biggest advance in software development technology in the ten years I’ve been writing articles here.