Page Comparison

Background

Now that we have the testing machines online, we need to extend our current branching model. experimental.slidewiki.org is likely to replace platform.manfredfris.ch but we need branches to feed testing and stable.sildewiki.org.

Thus I'd like to #propose the following branching model for our development: 

1. we keep the practice of developing on feature branches
2. the master branch holds the latest development (following Roy's suggestion in last meeting)a new branch testing is created, master is merged into testing after each sprint, QA is done against testing only code that PASSED QA
3. major releases are staged and maintained each on their own branch, a release branch is branch 
4. release branches are branched off master
5. minor versions are released from the corresponding major release branch
6. releases are marked with tags of the form 'v<major>.<minor>'