diff options
Diffstat (limited to 'index.html')
-rw-r--r-- | index.html | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -590,9 +590,21 @@ USE_OSGPLUGIN(<plugin2>) <li> When in doubt, "master" is used rather than "stable". </li> + </ul> + + <p> + And this is how the branches relete to each other: + </p> + + <ul class="compact-list"> + <li> + Every change to the "stable" branch + will be merged into "master". + </li> <li> - After a successful testing phase, the whole "master" - branch will be merged into "stable" (fast-forward). + After a successful testing phase, + the "stable" branch + will be fast-forwarded to "master". </li> </ul> </div> |