From: Graham Percival <graham@percival-music.ca>
Date: Wed, 15 Dec 2010 18:19:26 +0000 (+0000)
Subject: CG: add "git branch manager" to GOP policy list.
X-Git-Tag: release/2.13.44-1~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2b3c10a7f43a78ee08c84f1750c7671b510584c0;p=lilypond.git

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

diff --git a/Documentation/contributor/administration.itexi b/Documentation/contributor/administration.itexi
index eac2b4f5ab..3c21dcdb96 100644
--- 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