On Tue, Jun 14, 2011 at 10:01 PM, Bruce D'Arcus <[email protected]> wrote: > On Tue, Jun 14, 2011 at 9:48 PM, Rintze Zelle <[email protected]> wrote: >> On Tue, Jun 14, 2011 at 9:23 PM, Frank Bennett <[email protected]> >> wrote: >>> >>> So the idea is to have a more forward-leaning policy on commits? That >>> seems a good idea. We're getting to a stage where changes are often >>> inter-related, and it can be cumbersome to discuss proposals in >>> isolation. Pre-release vetting would provide an opportunity for >>> focused review. >> >> Maybe it would suffice to have a single development branch in each git repo >> for such proposals (people other than Frank, Bruce and me can also just fork >> if they want to create proposals). That way we wouldn't create too much of a >> mess in the main branch. > > This post seems to be an influential discussion of an effective git > branching model. > > <http://nvie.com/posts/a-successful-git-branching-model/> > > See discussion of feature branches. > > Git flow is based on this: > > <http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/> > > It's not exactly related to our use case, but perhaps close enough?
So if we went this direction, it would suggest adding a main "develop" branch. For new features, or major changes, one would then branch of "develop"; e.g. "my-new-feature." When we all approve it (by whatever process we settle on), that code gets merged back to "develop." ... etc (see link above) ... This gives people flexibility to play with stuff all they want without messing up the main schema code. Bruce ------------------------------------------------------------------------------ EditLive Enterprise is the world's most technically advanced content authoring tool. Experience the power of Track Changes, Inline Image Editing and ensure content is compliant with Accessibility Checking. http://p.sf.net/sfu/ephox-dev2dev _______________________________________________ xbiblio-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/xbiblio-devel
