Branching workflow

Work in progress.

Integration branch: master

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

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.

Stable branch: stable

Latest stable version (that is, released to publishers). It will advance with the latest stable release branch.

Tagged releases: v3.0

Every release is tagged using some sort of semantic versioning.

Other tips

• It might be not useful to use --no-ff sometimes, e.g. when moving the stable pointer forward, but this way you lose information about the user who did the merge