On Thu, Sep 8, 2011 at 10:45 AM, Marvin Addison <[email protected]> wrote: [snip] > > The proposal as stands is for a single active development branch > called master with maintenance branches as needed for important fixes. > The big projects I cited previously confirm this is both standard > practice in the git world and gives me confidence to claim it will be > sufficient for our needs. That said we can always change in the > future as need arises -- I hope we can all agree git allows a great > deal of flexibility to accommodate various development workflows. > >> * cas-3_4_x_maintenance -> master (tip of active >> development/integration/release branch) >> * cas-3_4_x_maintenance -> 3.4.x (maintenance branch if need for a >> point or security release) >> * cas-3_3_x_maintenance -> 3.3.x (maintenance branch if need for a >> point or security release) > > +1 > >> * rfe-lppe (feature branch) >> * rfe-cas4api (big feature branch :) > > I absolutely hate abbreviations for this kind of thing -- we do have > an international audience where acronyms may be meaningless. > s/rfe/feature/ and I'll +1.
Sounds like consensus to me! (at least bewteen the two of us :) I've tried to capture the essence of this thread in wiki (Marvin, please keep me honest) in hopes that it may provide clarity to this thread, and provide a place for us to record the vote. Apache style would give 72 hours for voting...that should be enough time for Marvin to have a go/no-go for Sunday. https://wiki.jasig.org/display/CAS/Proposed+migration+from+svn+to+git Best, Bill > > M > > -- > You are currently subscribed to [email protected] as: [email protected] > To unsubscribe, change settings or access archives, see > http://www.ja-sig.org/wiki/display/JSG/cas-dev > > -- You are currently subscribed to [email protected] as: [email protected] To unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/cas-dev
