...
- 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