Branches

Here is an illustration of Skosmos 3 development branches and tags around the time of the 3.0 release:

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 via pull requests when done.

Maintenance branches

Version-specific maintenance branches such as v3.0-maintenance are generated at the time of release. Bugs are generally fixed first on the main branch and then backported (using git cherry-pick) to the most recent maintenance branch. Bugfix releases (e.g. 3.0.1, 3.0.2) are created from the maintenance branch.

Skosmos 2 maintenance

The older Skosmos 2 codebase is on the skosmos-2 branch. Although development of Skosmos 2 has practically ceased, there may still be occasional bugfixes merged into that branch. They can then be cherry-picked to a maintenance branch such as v2.18-maintenance.

Tags

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

The maintenance branch contains version tags such as v3.0 and v3.0.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.