Branching

Jump to bottom Edit New page

smolafilip edited this page Aug 3, 2017 · 4 revisions

Branching

The branching follows the GitLab scheme. There are four types of branches: master, release/___, legacy/___, and feature/___.

Release Branches

Contain the stable minor versions of the project.
Based on the master branch.
After the branching point, only serious bug fixes are applied.
Names are release/<major>.<minor>.x.
Patch versions on these branches are handled with tags.

Legacy Branches

Branches that are considered worth keeping in their state from the original code.

Feature Branches

First merged into the master branch.
Then get cherry-picked into the maintenance branches if required (while increasing the patch version).

Versioning

Follows the standard Maven versioning scheme, starting one version up from where Forgerock left off.