Sorry, to be more specific: After release work is complete, we then merge it on master and develop again, tag it and delete the release branch.
On Wed, Jan 6, 2016 at 4:02 PM, William Markito <wmark...@pivotal.io> wrote: > That's not what I understood. > > My understanding is that we would call for the release and create a branch > from develop and do the remaining work for the release there AND let > develop continue it's flow. > > After release work is complete, we then merge it on master, tag it and > delete the release branch. > > Does that make sense ? > > On Wed, Jan 6, 2016 at 3:58 PM, Dan Smith <dsm...@pivotal.io> wrote: > >> So to be clear, even though we are creating a release branch, nothing >> should be checked in to develop that is not intended for the 1.0.0 >> release. >> I'm fine with that. It does mean as we get close to 1.0.0 we will need to >> "lock down" develop so we don't check things in that might break the 1.0.0 >> release. That seems slightly contrary to the way I thought git flow was >> supposed to work. >> >> -Dan >> >> On Wed, Jan 6, 2016 at 3:41 PM, Jianxia Chen <jc...@pivotal.io> wrote: >> >> > +1 >> > >> > On Wed, Jan 6, 2016 at 3:38 PM, Anthony Baker <aba...@pivotal.io> >> wrote: >> > >> > > I was expecting we would always create release branches from develop. >> > > >> > > >> > > > On Jan 6, 2016, at 3:35 PM, Dan Smith <dsm...@pivotal.io> wrote: >> > > > >> > > >> >> > > >> I believe we are farther away from the actual '1.0.0' release, so >> it >> > > does >> > > >> not make sense to have the long standing release branch. >> > > >> >> > > > >> > > > Maybe I'm confused about where the next alpha or beta branch will be >> > > > created from. Are you thinking it will be created from the >> > > > release-1.0.0-alpha branch, or the develop branch? >> > > > >> > > > -Dan >> > > >> > > >> > >> > > > > -- > > William Markito Oliveira > -- For questions about Apache Geode, please write to > *dev@geode.incubator.apache.org > <dev@geode.incubator.apache.org>* > > > -- William Markito Oliveira -- For questions about Apache Geode, please write to *dev@geode.incubator.apache.org <dev@geode.incubator.apache.org>*
