Le 19/04/13 20:18, Daniel Russel a écrit : > On Apr 19, 2013, at 10:35 AM, Ben Webb ben@salilab.org wrote: > >> On 4/19/13 10:29 AM, Daniel Russel wrote: >>> The only issue that is in the release milestone relates to the web pages. >> I would prefer to let the nightly build run first to make sure no horrible problems have cropped up, then update master from that revision. Otherwise it would seem that the release hasn't even been tested to compile everywhere, which is less testing than the nightly builds themselves. > Sure. I practice, I think that and what I am suggesting are identical (in that we will continue to patch the release and there will be plenty of lag between declaring a version the release and getting everything ready for people to take). > If by release you mean a release branch (see first figure of http://nvie.com/posts/a-successful-git-branching-model/), which implies to freeze functionality and only correct warnings and bugs, I agree. There are still warnings in the isd module so I would like to get rid of them before we commit everything to master.
Just to be sure: we *are* following the git-flow model as described in this link, are we? With feature branches, release, hotfix, and develop and master, right?