I'm using svn without branches (trunk-only) for a very long time at my workplace. I had discovered most or all of the issues related to projects which do not have any branching strategy. Unlikely this is not going to change at my workplace but for my private projects.
For my private projects which most includes coworkers and working together at the same time on different features I like to have an robust branching strategy with supports long-term releases powered by git.
I find out that the Atlassian Toolchain (JIRA, Stash and Bamboo) helped me most and it also recommending me an branching strategy which I like to verify for the team needs.
The branching strategy was taken directly from Atlassian Stash recommendation with a small modification to the hotfix branch tree. All hotfixes should also merged into mainline.
The branching strategy in words
- mainline (also known as master with git or trunk with svn) contains the "state of the art" developing release. Everything here was successfully checked with various automated tests (through Bamboo) and looks like everything is working. It is not proven as working because of possible missing tests. It is ready to use but not recommended for production.
- feature covers all new features which are not completely finished. Once a feature is finished it will be merged into mainline. Sample branch:
- bugfix fixes non-critical bugs which can wait for the next normal release. Sample branch:
- production owns the latest release.
- hotfix fixes critical bugs which have to be release urgent to mainline, production and all affected long-term releasees. Sample branch:
- release is for long-term maintenance. Sample branches:
I am not an expert so please provide me feedback. Which problems might appear? Which parts are missing or slowing down the productivity?