You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geode.apache.org by Anthony Baker <ab...@pivotal.io> on 2018/12/12 17:07:31 UTC
Default branch for geode-examples
Alexander noticed that some recent PR’s against the geode-examples repo made against the master branch. That breaks the gitflow approach where only released code is on master. Should we update the default branch to be develop?
Anthony
Re: Default branch for geode-examples
Posted by Michael Stolz <ms...@pivotal.io>.
Consistency is best in my opinion.
--
Mike Stolz
Principal Engineer - Gemfire Product Manager
Mobile: 631-835-4771
On Dec 12, 2018 9:59 AM, "Jacob Barrett" <jb...@pivotal.io> wrote:
> Make the default “develop” to be consistent with the rest of our
> repositories. Put a statement in the https://urldefense.proofpoint.
> com/v2/url?u=http-3A__README.md&d=DwIFaQ&c=lnl9vOaLMzsy2niBC8-h_K-
> 7QJuNJEsFrzdndhuJ3Sw&r=us915XVL1kT8_Q-vmxAPAGcdk8eQkhBJKJGVCwFNFlA&
> m=2d4Fya8f3YbP-qfZHyIna7bxGf6bav_f6x5ygphVvmw&s=
> ATi5iKFzdX8ndZkkBDCbBHeidnwAGhMWjQaB3PMoI4k&e= that these examples for
> the 1.9.0-SNAPSHOT (develop). When cutting a release and merging to master
> change the say they are for 1.9.0 (rel/v1.9.0).
>
>
> > On Dec 12, 2018, at 9:07 AM, Anthony Baker <ab...@pivotal.io> wrote:
> >
> > Alexander noticed that some recent PR’s against the geode-examples repo
> made against the master branch. That breaks the gitflow approach where
> only released code is on master. Should we update the default branch to be
> develop?
> >
> >
> > Anthony
> >
>
>
Re: Default branch for geode-examples
Posted by Jacob Barrett <jb...@pivotal.io>.
Make the default “develop” to be consistent with the rest of our repositories. Put a statement in the README.md that these examples for the 1.9.0-SNAPSHOT (develop). When cutting a release and merging to master change the say they are for 1.9.0 (rel/v1.9.0).
> On Dec 12, 2018, at 9:07 AM, Anthony Baker <ab...@pivotal.io> wrote:
>
> Alexander noticed that some recent PR’s against the geode-examples repo made against the master branch. That breaks the gitflow approach where only released code is on master. Should we update the default branch to be develop?
>
>
> Anthony
>
Re: Default branch for geode-examples
Posted by Alexander Murmann <am...@pivotal.io>.
I agree that there is a conflict here of what might be most usable for
users vs. developers contributing to the geode-examples repo.
No matter which route we go down, we should improve guidance. If we keep
master the default, I +1 Owen's suggestion of amending the template. If we
make develop the default, we should amend the readme to recommend either
downloading the release TGZ or cloning the corresponding SHA.
On Wed, Dec 12, 2018 at 9:43 AM Owen Nichols <on...@pivotal.io> wrote:
> I believe master is still the best default branch for most users. Can we
> add a PR template for geode-examples reminding developers that examples PRs
> must be based on develop, not master?
>
> Generally the only difference between examples' develop and master is
> which maven repo it points to (snapshot and release, respectively). I
> assume the Geode release process include a step for merging changes from
> develop to master after each release?
>
> -Owen
>
> > On Dec 12, 2018, at 9:24 AM, Anthony Baker <ab...@pivotal.io> wrote:
> >
> > I’m fine with moving all development work to master given the use case
> for geode-examples—I just don’t want PR’s merged to *both* master and
> develop.
> >
> > Other thoughts?
> >
> > Anthony
> >
> >
> >> On Dec 12, 2018, at 9:16 AM, Dan Smith <ds...@pivotal.io> wrote:
> >>
> >> Good question! I think we intentionally left the default branch as
> master
> >> so that users cloning the examples from github will get examples that
> work
> >> against a released version of geode.
> >>
> >> That said, I don't feel too strongly if we would rather make things more
> >> consistent with the geode repo - it seems like we also try to keep
> develop
> >> stable.
> >>
> >> -Dan
> >>
> >> On Wed, Dec 12, 2018 at 9:07 AM Anthony Baker <ab...@pivotal.io>
> wrote:
> >>
> >>> Alexander noticed that some recent PR’s against the geode-examples repo
> >>> made against the master branch. That breaks the gitflow approach where
> >>> only released code is on master. Should we update the default branch
> to be
> >>> develop?
> >>>
> >>>
> >>> Anthony
> >>>
> >>>
> >
>
>
Re: Default branch for geode-examples
Posted by Owen Nichols <on...@pivotal.io>.
I believe master is still the best default branch for most users. Can we add a PR template for geode-examples reminding developers that examples PRs must be based on develop, not master?
Generally the only difference between examples' develop and master is which maven repo it points to (snapshot and release, respectively). I assume the Geode release process include a step for merging changes from develop to master after each release?
-Owen
> On Dec 12, 2018, at 9:24 AM, Anthony Baker <ab...@pivotal.io> wrote:
>
> I’m fine with moving all development work to master given the use case for geode-examples—I just don’t want PR’s merged to *both* master and develop.
>
> Other thoughts?
>
> Anthony
>
>
>> On Dec 12, 2018, at 9:16 AM, Dan Smith <ds...@pivotal.io> wrote:
>>
>> Good question! I think we intentionally left the default branch as master
>> so that users cloning the examples from github will get examples that work
>> against a released version of geode.
>>
>> That said, I don't feel too strongly if we would rather make things more
>> consistent with the geode repo - it seems like we also try to keep develop
>> stable.
>>
>> -Dan
>>
>> On Wed, Dec 12, 2018 at 9:07 AM Anthony Baker <ab...@pivotal.io> wrote:
>>
>>> Alexander noticed that some recent PR’s against the geode-examples repo
>>> made against the master branch. That breaks the gitflow approach where
>>> only released code is on master. Should we update the default branch to be
>>> develop?
>>>
>>>
>>> Anthony
>>>
>>>
>
Re: Default branch for geode-examples
Posted by Anthony Baker <ab...@pivotal.io>.
I’m fine with moving all development work to master given the use case for geode-examples—I just don’t want PR’s merged to *both* master and develop.
Other thoughts?
Anthony
> On Dec 12, 2018, at 9:16 AM, Dan Smith <ds...@pivotal.io> wrote:
>
> Good question! I think we intentionally left the default branch as master
> so that users cloning the examples from github will get examples that work
> against a released version of geode.
>
> That said, I don't feel too strongly if we would rather make things more
> consistent with the geode repo - it seems like we also try to keep develop
> stable.
>
> -Dan
>
> On Wed, Dec 12, 2018 at 9:07 AM Anthony Baker <ab...@pivotal.io> wrote:
>
>> Alexander noticed that some recent PR’s against the geode-examples repo
>> made against the master branch. That breaks the gitflow approach where
>> only released code is on master. Should we update the default branch to be
>> develop?
>>
>>
>> Anthony
>>
>>
Re: Default branch for geode-examples
Posted by Dan Smith <ds...@pivotal.io>.
Good question! I think we intentionally left the default branch as master
so that users cloning the examples from github will get examples that work
against a released version of geode.
That said, I don't feel too strongly if we would rather make things more
consistent with the geode repo - it seems like we also try to keep develop
stable.
-Dan
On Wed, Dec 12, 2018 at 9:07 AM Anthony Baker <ab...@pivotal.io> wrote:
> Alexander noticed that some recent PR’s against the geode-examples repo
> made against the master branch. That breaks the gitflow approach where
> only released code is on master. Should we update the default branch to be
> develop?
>
>
> Anthony
>
>