Branching workflow

Please do not translate this page.

Integration branch: master

This branch is where all other feature branches are merged into.
Merge to this branch is allowed only by a project owner or coordinator.

NOTE: merges into this branch must not be fast-forwards.

Feature branch: feature/name

Create a branch for anything you want to implement. Later merge to master will be authorized by a project owner or coordinator.

Release branch: release/major.minor

Created at the beginning of a minor release (even alpha or beta) and might be kept forever for historical reasons. It will advance with master for changes that should go into a new release. It will also contain hotfixes.

NOTE: this branch should follow commit history of the master branch, that is fast-forwarding with it. Commits to this branch are allowed only for last minute fixes and eventually merged to master.

Stable branch: stable

Latest stable version (that is, released to non-beta publishing channels). It will advance with the latest stable release branch.

NOTE: this branch should follow commit history of the master branch, that is fast-forwarding with it.

Tagged releases: v4.0.0

Every release is tagged using some sort of semantic versioning.