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:
- we keep the practice of developing on feature branches
- 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
- major releases are staged and maintained each on their own branch, minor version go to the same branch