summaryrefslogtreecommitdiffstats
path: root/index.html
diff options
context:
space:
mode:
authorVolker Grabsch <v@njh.eu>2013-07-18 10:18:25 (GMT)
committerVolker Grabsch <v@njh.eu>2013-07-18 10:18:25 (GMT)
commit835dac9718ca131b9f31387638435e20ee247dd6 (patch)
treee1f604a939aa678f79ef2c6154f04bc03894b81f /index.html
parentfabef6cc30dd522639ef05595f27064812582c00 (diff)
downloadmxe-835dac9718ca131b9f31387638435e20ee247dd6.zip
mxe-835dac9718ca131b9f31387638435e20ee247dd6.tar.gz
mxe-835dac9718ca131b9f31387638435e20ee247dd6.tar.bz2
Clarify branch concept
Diffstat (limited to 'index.html')
-rw-r--r--index.html16
1 files changed, 14 insertions, 2 deletions
diff --git a/index.html b/index.html
index 8e1ec4e..d9e2ee1 100644
--- a/index.html
+++ b/index.html
@@ -590,9 +590,21 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
<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>