Hacker News new | ask | show | jobs
by Touche 4017 days ago
Why not just use tags?
2 comments

We use a master / development branch strategy. For us, the main problem with having one branch and tagging releases is that it's relatively common for work to continue on the development branch while the release branch is still being tested. For us, there's a 2 day period where we're testing out the upcoming release. Developers will be fixing bugs on this release branch, and also commiting new code for the subsequent release. If we had one branch with tags, developers would need to keep all their new code on feature branches until a release is completed, and the likelihood of accidentally releasing an untested feature gets a lot higher (one advantage of having two branches is that you can treat your production branch with a lot more care)
You might want to cherry pick some commits from the dev branch into a stable branch from time to time (security fixes, things like that).
Sure, you can do that with tags. Branch off from your tag, cherry-pick your commits, push and if tests pass create a new tag.