Changes between Version 2 and Version 3 of ModBigPicture

Timestamp:

Dec 3, 2013, 3:24:06 PM (9 years ago)

Author:

Beman Dawes

Comment:

--

ModBigPicture

@@ -24 +24 @@
 == Branches ==
 
-Releases for both the super-project and individual libraries are always on a branch named "master". Branch master should be stable at all times. Branch master should only be pushed to the library's public repository when it is ready to ship.
+Boost requires all libraries have at least the two branches {{{master}}} and {{{develop}}}.
 
-Boost strongly encourages that the main development branch be named "develop".
+Releases for both the super-project and individual libraries are always on branch {{{master}}}. {{{master}}} in the library's {{{boostorg}}} public repo should be stable at all times, so should only be pushed to the library's public repository when it is stable and ready to ship.
+
+Branch {{{develop}}} is the main development branch. Whether or not {{{develop}}} is stable in the library's public {{{boostorg}}} repository is up to the library maintainer.
+
+Additional branches, if any, are up to the library maintainer. See the discussion of Git Flow, below. 
  
 == Directory Structure ==