Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

There will always be a master and a develop branch. The current develop branch is 24.x - once we reach the next major milestone it will be 35.x and so on. This is the branch where we do our daily work. When we implement a new feature, we will add a feature branch and develop this particular feature there, e.g. feature/webapi. When we're confident it's ready to be released, we merge it with the current develop branch.

To be able to provide (urgent) fixes to the latest or any previous stable release, we seal the current develop branch every time we make a new minor release and name it after this release (e.g. 13.2.x). The special branch named master always hints at the latest stable release and is tagged with the corresponding version (e.g. 13.2.12)