Skip to content
Jarno Elovirta edited this page Dec 18, 2015 · 2 revisions

OBSOLETE

Current Git branch strategy is the same as what was used with CVS. For a 3 milestone release cycle:

 M3 R     M1 M2 M3 R     M1
-0--0-   -0--0--0--0-   -0-  release branches
      \ /            \ /
-------0--------------0----  "master"

Development is carried out in release branches B_MT* and after each release, the code is merged to master. Each new development cycle starts with the creation of the release branch.

Clone this wiki locally