...
- features and bug fixes are developed on own branches that are branched off master
- before a branch is merged into master it has to pass technical QA
- master is merged into release at the end of each sprint
- a release is taken from the release branch by tagging the respective commit object
Use of Servers
- experimental.slidewiki.org - state of master is deployed after each commit
- testing.slidewiki.org - state of release is deployed after merge
- stable.slidewiki.org - runs the latest release
...