|
Boost : |
Subject: Re: [boost] Request for comments on super-project workflow doc
From: Peter Dimov (lists_at_[hidden])
Date: 2014-01-02 17:47:30
Beman Dawes wrote:
> See https://svn.boost.org/trac/boost/wiki/SuperProjectWorkflow
> Comments welcome!
"Changes from original proposal" says "Releases branched from "master", per
Git Flow."
But that's not how Git Flow works. Release branches are created from
"develop" and merged to "master". Only hotfix branches are created from
"master".
Reference: http://nvie.com/posts/a-successful-git-branching-model/
"Release branches
May branch off from: develop
Must merge back into: develop and master
Branch naming convention: release-*"
"Hotfix branches
May branch off from: master
Must merge back into: develop and master
Branch naming convention: hotfix-*"
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk