Changes between Version 17 and Version 18 of StartModMaint

Timestamp:

Dec 10, 2013, 2:59:02 PM (9 years ago)

Author:

Beman Dawes

Comment:

--

StartModMaint

@@ -132 +132 @@
 }}} 
 
-=== First post-conversion merge to {{{master}}} ===
+=== First post-svn conversion merge to {{{master}}} ===
 
 When you are ready to merge the {{{develop}}} branch to {{{master}}} (or better yet a release branch that's branched off {{{master}}}), there's a bit of housekeeping to be done
@@ -177 +177 @@
 You're now ready for "routine" merges to proceed as per Gitflow (or whatever other strategy you wish to use).
 
-=== Library release ===
+=== Lightweight library release ===
 
+Small, simple libraries and simple releases just merge {{{develop}}} into {{{master}}}, tag {{{master}}}, and declare victory.
+
+{{{
+git checkout master
+git merge --no-ff develop
+git tag -a 1.56.1
+}}} 
+
+=== Heavyweight library release ===
+
+Large, complex libraries, particularly those with multiple developers working in parallel, need to use a release procedure that scales up better than the lightweight procedure. The Git Flow approach is recommended. Find out more at [wiki:StartModWorkflow Modular Boost Library Workflow Overview] and be sure to study the examples given in [http://nvie.com/posts/a-successful-git-branching-model/ Vincent Driessen's original blog posting].