Branch naming conventions¶
Branches used by the platform, Easy plugins and RYSes. How to name your own task branch and which branch to target is in Contributing.
Integration branches¶
The flow is next/minor -> next/minor-rc -> master, with next/bugs for fixes of the released version. Platform and Easy plugins use the same names; RYS repositories use the same names where they exist.
| Branch | Purpose |
|---|---|
next/minor |
Main development branch. Features and fixes for the next minor release. Code here must work and tests must pass. |
next/minor-rc |
Code freeze before a minor release. Only fixes of issues found in testing; QA feedback goes directly here. |
next/bugs |
Bug fixes of the released version that can wait for the next patch release. No new features. |
next/major, next/major-rc |
Features for the next major release, and its code freeze. |
master |
The released version, currently in production. Only critical fixes, always coordinated with the team. |
next/* branches and master are protected: never push to them directly.
Task branches¶
Create task branches from the branch you target, named feature/[TICKET_ID_]description or fix/[TICKET_ID_]description (lowercase ASCII, underscores):
Target next/minor unless next/bugs or master is explicitly requested. A task that spans several repositories uses the same branch name in each of them.
Build branches¶
Use build/[TICKET_ID_]description to deploy interconnected features for testing, for example build/425_add_author_to_project. A build branch can be created for one purpose, or deleted and re-created with different features. Build branches are protected.