Commit 612f1aae authored by Imre Jonk's avatar Imre Jonk

Add Git branching model

parent a941f21b
Pipeline #11 passed with stage
......@@ -18,6 +18,11 @@ $ git clone https://code.bof.nl/bitsoffreedom/bba2015.git
Great! You will need an account on https://code.bof.nl, or you can just sign in using GitHub. Once logged in, you can fork the project into your own account and edit and experiment all you want, without having to worry about the original repository. If you have a meaningful contribution, let us know by issuing a merge request to the 'develop' branch. You can contact imre.jonk@bof.nl for any questions and for developer access, so you can push commits to all branches (except master) and have everything deployed to https://bba2015-dev.bof.nl, without having to deal with merge requests.
### 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..
### Fonts
Because of licensing restrictions, the fonts we use for https://bba2015.bof.nl cannot be stored in the Git repository.
......
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