Commit 6016f9a7 authored by Imre Jonk's avatar Imre Jonk

Add note about protected release branch

parent 612f1aae
Pipeline #12 passed with stage
......@@ -21,7 +21,7 @@ Great! You will need an account on https://code.bof.nl, or you can just sign in
### Git branching model
See http://nvie.com/posts/a-successful-git-branching-model/.
TL;DR: developers push their commits into 'develop' or specific feature branches and merge them into 'release' to freeze the untested new functionality. Only bugfixes should be pushed to 'release' after the freeze. When 'release' has been sufficiently tested, it is merged into master with a release tag. Hotfixes should be pushed to 'hotfix' and merged into master with a second point release tag as soon as they are tested..
TL;DR: developers push their commits into 'develop' or specific feature branches and merge them into the new 'release-X.0' branch to freeze the untested new functionality. Only bugfixes should be pushed to 'release-X.0' after the freeze (to prevent accidental pushes, this branch should be protected using "Branch Protection"). When 'release-X.0' has been sufficiently tested, it is merged into master with a release tag. Hotfixes should be pushed to 'hotfix' and merged into master with a second point release tag as soon as they are tested.
### Fonts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment