CG: add "git branch manager" to GOP policy list.

diff --git a/Documentation/contributor/administration.itexi b/Documentation/contributor/administration.itexi
index eac2b4f5ab1e39841c021380d782b69ca2fcce9e..3c21dcdb963f6c92dbc4248c614bd92e7ad0a4be 100644 (file)
--- a/Documentation/contributor/administration.itexi
+++ b/Documentation/contributor/administration.itexi
@@ -347,7 +347,7 @@ discussion.
 
 @warning{The estimated time required for "prep work", and the
 following discussion, has been added to each item.  At the moment,
-there is an estimated 30 hours of prep work and 125 hours of
+there is an estimated 30 hours of prep work and 135 hours of
 discussion.}
 
 @itemize
@@ -476,6 +476,15 @@ Should we change the "structure" / "framework" for bounties?
 
 (prep: 2 hours.  discuss: 10 hours)
 
+@item @strong{Separate branches for active development}:
+it might be good to have @emph{everybody} working on separate
+branches.  This complicates the git setup, but with sufficient
+logic in lily-git.tcl, we can probably make it transparent to
+newbies.  However, we'd need a reliable person to handle all the
+required merging and stuff.
+
+(prep: 2 hours.  discuss: 10 hours)
+
 @end itemize