Branching Model

Rules for Branching

1. features and bug fixes are developed on own branches that are branched off master
   
2. before a branch is merged into master it has to pass technical QA
   
3. master is merged into release at the end of each sprint
4. a release is taken from the release branch by tagging the respective commit object
   

Use of Servers

• platform.experimental.slidewiki.org - state of master is deployed after each commit
• testing.slidewiki.org - state of release is deployed after merge with master on sprint end
  
• stable.slidewiki.org - runs the latest release