We’re a small team of developers and building a web application. We’re currently having a live, testing and several development environments.
What branch architecture would you suggest, so ideally each developer can work on his feature(s), these can be tested and deployed without tangenting other developers/features?
Currently, each developer has its own development branch and rebases into the testing branch. As soon as a feature is approved, the developer rebases his changes into the master.
This works as long as the features are tested immediately. However, if one developer is working on the next feature while the feature before is still tested, we need to handle things manually.
Thanks for opinions.
It has been a while that I follow this useful guidelines described by Vincent Driessen in his article A successful Git branching model.
You can take a look there and you will see how he describes the branches management and avoid rebases