Clarify branch concept

This commit is contained in:
Volker Grabsch 2013-07-18 12:18:25 +02:00
parent fabef6cc30
commit 835dac9718
1 changed files with 14 additions and 2 deletions

View File

@ -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>
After a successful testing phase, the whole "master"
branch will be merged into "stable" (fast-forward).
Every change to the "stable" branch
will be merged into "master".
</li>
<li>
After a successful testing phase,
the "stable" branch
will be fast-forwarded to "master".
</li>
</ul>
</div>