This article does a great job explaining how to organize a project in order to eliminate the problem of “We released v1.0 and are working on v1.1. How do we do a release for v1.0 with a new bug fix without sending partial code for v1.1 into production?”