Usually it's > master (used only for deploying on prod) > dev (used for merging feature branches into the "new" master branch that's going to be deployed in a

Usually it's > master (used only for deploying on prod) > dev (used for merging feature branches into the "new" master branch that's going to be deployed in a few weeks) > feature-branch (based off of the current dev build, getting merged back into dev when it's finished) We usually have a prod machine and a test machine running, the test machine usually runs dev for QA to test out the future build. If we need to test a feature branch before merging, we're deploying that one there instead and swap it out for dev when the test is finished. This model obviously only works with a finite number of developers up to a certain point. But for us this is enough to be productive and not get into each other's way when developing multiple features.