Some more fuel for the any fires: https://wiki.duraspace.org/display/FCREPO/Git+Guidelines+and+Best+Practices#GitGuidelinesandBestPractices-CommitMessages
:-) On Wed, Sep 7, 2011 at 10:11 AM, Marvin Addison <[email protected]>wrote: > > The value of having a master and a develop branch is in the way that > > master is only updated via a hotfix or a release branch thus freeing > > up develop for continued evolution without the need for a code freeze > > as is typical with svn/trunk style. > > Merging from the active development branch into a tag is functionally > equivalent, and would be natural to any of us subversion users. More > to the point, of the following random open source projects I reviewed, > none uses the model you're advocating: > > - http://git.springsource.org/spring-security/spring-security > - https://github.com/grails/grails/branches > - https://github.com/django/django/branches > > > I'd be happy trying this model; it's clear, documented, and ready to > > go. If not this one, I think we need come to some consensus > > My proposal is still up for vote. I'm happy to include > cas-lppe-feature in the branches we'll port, but a single active > development branch, master, is what I've proposed and is both common > and best practice. While I'd like to come to consensus, I'm happy > with majority wins in order to move forward. We should strike a > balance between planning and execution; I'd like to act on this Sunday > night. > > 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
