Branches

Development branches (Skosmos 3)

Development of Skosmos 3 happens on the main branch. There may also be feature branches for specific features that are developed in their own branches and then merged to main when done.

Maintenance branches (Skosmos 2)

Version-specific maintenance branches such as v0.7-maintenance are generated around the time of release. Bugs are generally fixed first on the skosmos-2 branch and then backported (using git cherry-pick) to the most recent maintenance branch. Periodic bugfix releases (e.g. 0.7.1, 0.7.2) are created from the maintenance branch.

Tags

The main branch contains tags such as v0.7-dev and v1.0-dev which mark the start of a new cycle of development.

The maintenance branch contains version tags such as v0.7 and v0.7.1.

To find out which version is running use the command git describe --tags. This will show the most recent tag plus some additional information about the current state of the code you have.