Workflow

Workflow on Linux Stopmotion

• We have a master branch for development and a branch for each releases (ie: release-X.Y.Z).

• Code in the release branch must be stable: The only changes that are allowed on a release branch are fixes for branches that would prevent that release. The changes should be small and low-risk -- this could mean using a smaller fix than one that has been developed for the master branch.

• Code that has not been tested on another branch should not be merged into the master branch.

• It's not permitted to commit directly to these branches. All commits must be merge requests from development branches.

• We must perform user tests on each merge request before we merge it. We must continue to do this until we have an automatic test suite and it has sufficient coverage.

Case 1. Bug on master
Case 2. New feature on master
Case 3. Bug on release-X.Y.Z (Hotfix)
Case 4. New release