...
| Status | ||||
|---|---|---|---|---|
|
...
...
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:
...
Rules for Branching
- 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
- 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
Drawio baseUrl https://slidewiki.atlassian.net/wiki diagramName SlideWiki Branching Model width 694890.5 zoom 1 pageId 12517406 lbox 1 height 362581 revision 28