New Post: Branching Strategy - (dev, qa, uat, stage) to Branch Per Release

Hi Bill-

I do love the simplicity of the strategy but i have a couple of questions I'm hoping you can help me with.

After you deploy from DEV to QA or UAT, where do you start working on your next round of DEV changes? Because, what if there are necessary changes to the UAT code? Since there is no UAT branch, where would you do the changes so that they don't get jumbled with the next round of DEV? Same goes for changes to RELEASE for emergency bug fixes but I assume that in this case you manually write the changes into RELEASE and into DEV.

We have a single release web site for our customers. We do QA/UAT before releasing updates. We do separate DEV while code is in QA/UAT. My plan may involve a service branch but we may just do fixes in the RELEASE branch.

A little bit of guidance here would be a huge help and much appreciated.