The PLC4X project uses the following branching model.
The same model is used for a wide variety of other projects, so it should be pretty straight forward.
mastercontains the latest released state.
Development is performed on the
Features are developed in Feature-Branches with a prefix
Each minor release has a corresponding release branch
A release branch is spawned from
Bugfix releases don’t have a dedicated release branch, they are just performed on the corresponding minor versions release branch