You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geode.apache.org by jun aoki <ja...@apache.org> on 2015/06/16 01:23:27 UTC
master to be default branch?
Hi Geode community
Since the project code base is on git, I thought it would be
straightforward to have Default and the latest on "master", (which is git's
default latest branch name).
https://github.com/apache/incubator-geode/branches
shows "develop" is Default and most active.
If we follow git convention, new comers (like me) would not be confused
which branch to work on.
--
-jun
Re: master to be default branch?
Posted by jun aoki <ja...@apache.org>.
Thank you William! I've modified the wiki.
On Mon, Jun 15, 2015 at 5:21 PM, William Markito <wm...@pivotal.io>
wrote:
> Thanks! Permissions should be in place now... ;)
>
> On Mon, Jun 15, 2015 at 5:10 PM, jun aoki <ja...@apache.org> wrote:
>
> > Hi William, thank you for clarifying. I was not personally used to the
> > branching model but why not!?
> >
> > There might be some audience who fall into the same question, I'd like to
> > add following lines to the branching strategy page
> >
> https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=57311457
> > (Could you give me access to modify the Geode wiki?)
> >
> > My suggestions
> > ==========================
> > Branch naming pattern -> Branching strategy
> > - "master" branch holds most *stable* code base. Release versions are
> > tagged on this branch. Once in a release mode, a commit from "develop"
> > branch is cut and merge to master and only stabilizing patches go into
> this
> > branch.
> >
> > - "develop" branch holds the latest code. It is used for active
> development
> > and can be unstable time to time. Contributors can develop enhancements
> on
> > this branch and make patches.
> >
> >
> > On Mon, Jun 15, 2015 at 4:33 PM, William Markito <wm...@pivotal.io>
> > wrote:
> >
> > > Hi Jun,
> > >
> > > We decided to follow git-flow [1] conventions and by having default
> set
> > > to develop allow us to close PR's once they're merged in develop,
> keeping
> > > master with the latest stable/release code.
> > >
> > > Although you're right that it can be confusing and we should update
> our
> > > wiki with those decisions, now that they're made.
> > >
> > > Thanks,
> > >
> > > [1]
> > >
> > >
> >
> https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/
> > > [2] danielkummer.github.io/git-flow-cheatsheet/
> > > [3] http://nvie.com/posts/a-successful-git-branching-model/
> > >
> > >
> > > On Mon, Jun 15, 2015 at 4:23 PM, jun aoki <ja...@apache.org> wrote:
> > >
> > > > Hi Geode community
> > > >
> > > > Since the project code base is on git, I thought it would be
> > > > straightforward to have Default and the latest on "master", (which is
> > > git's
> > > > default latest branch name).
> > > > https://github.com/apache/incubator-geode/branches
> > > > shows "develop" is Default and most active.
> > > >
> > > > If we follow git convention, new comers (like me) would not be
> confused
> > > > which branch to work on.
> > > >
> > > > --
> > > > -jun
> > > >
> > >
> > >
> > >
> > > --
> > >
> > > William Markito Oliveira
> > >
> > > -- For questions about Apache Geode, please write to
> > > *dev@geode.incubator.apache.org
> > > <de...@geode.incubator.apache.org>*
> > >
> >
> >
> >
> > --
> > -jun
> >
>
>
>
> --
>
> William Markito Oliveira
>
> -- For questions about Apache Geode, please write to
> *dev@geode.incubator.apache.org
> <de...@geode.incubator.apache.org>*
>
--
-jun
Re: master to be default branch?
Posted by William Markito <wm...@pivotal.io>.
Thanks! Permissions should be in place now... ;)
On Mon, Jun 15, 2015 at 5:10 PM, jun aoki <ja...@apache.org> wrote:
> Hi William, thank you for clarifying. I was not personally used to the
> branching model but why not!?
>
> There might be some audience who fall into the same question, I'd like to
> add following lines to the branching strategy page
> https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=57311457
> (Could you give me access to modify the Geode wiki?)
>
> My suggestions
> ==========================
> Branch naming pattern -> Branching strategy
> - "master" branch holds most *stable* code base. Release versions are
> tagged on this branch. Once in a release mode, a commit from "develop"
> branch is cut and merge to master and only stabilizing patches go into this
> branch.
>
> - "develop" branch holds the latest code. It is used for active development
> and can be unstable time to time. Contributors can develop enhancements on
> this branch and make patches.
>
>
> On Mon, Jun 15, 2015 at 4:33 PM, William Markito <wm...@pivotal.io>
> wrote:
>
> > Hi Jun,
> >
> > We decided to follow git-flow [1] conventions and by having default set
> > to develop allow us to close PR's once they're merged in develop, keeping
> > master with the latest stable/release code.
> >
> > Although you're right that it can be confusing and we should update our
> > wiki with those decisions, now that they're made.
> >
> > Thanks,
> >
> > [1]
> >
> >
> https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/
> > [2] danielkummer.github.io/git-flow-cheatsheet/
> > [3] http://nvie.com/posts/a-successful-git-branching-model/
> >
> >
> > On Mon, Jun 15, 2015 at 4:23 PM, jun aoki <ja...@apache.org> wrote:
> >
> > > Hi Geode community
> > >
> > > Since the project code base is on git, I thought it would be
> > > straightforward to have Default and the latest on "master", (which is
> > git's
> > > default latest branch name).
> > > https://github.com/apache/incubator-geode/branches
> > > shows "develop" is Default and most active.
> > >
> > > If we follow git convention, new comers (like me) would not be confused
> > > which branch to work on.
> > >
> > > --
> > > -jun
> > >
> >
> >
> >
> > --
> >
> > William Markito Oliveira
> >
> > -- For questions about Apache Geode, please write to
> > *dev@geode.incubator.apache.org
> > <de...@geode.incubator.apache.org>*
> >
>
>
>
> --
> -jun
>
--
William Markito Oliveira
-- For questions about Apache Geode, please write to
*dev@geode.incubator.apache.org
<de...@geode.incubator.apache.org>*
Re: master to be default branch?
Posted by jun aoki <ja...@apache.org>.
Hi William, thank you for clarifying. I was not personally used to the
branching model but why not!?
There might be some audience who fall into the same question, I'd like to
add following lines to the branching strategy page
https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=57311457
(Could you give me access to modify the Geode wiki?)
My suggestions
==========================
Branch naming pattern -> Branching strategy
- "master" branch holds most *stable* code base. Release versions are
tagged on this branch. Once in a release mode, a commit from "develop"
branch is cut and merge to master and only stabilizing patches go into this
branch.
- "develop" branch holds the latest code. It is used for active development
and can be unstable time to time. Contributors can develop enhancements on
this branch and make patches.
On Mon, Jun 15, 2015 at 4:33 PM, William Markito <wm...@pivotal.io>
wrote:
> Hi Jun,
>
> We decided to follow git-flow [1] conventions and by having default set
> to develop allow us to close PR's once they're merged in develop, keeping
> master with the latest stable/release code.
>
> Although you're right that it can be confusing and we should update our
> wiki with those decisions, now that they're made.
>
> Thanks,
>
> [1]
>
> https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/
> [2] danielkummer.github.io/git-flow-cheatsheet/
> [3] http://nvie.com/posts/a-successful-git-branching-model/
>
>
> On Mon, Jun 15, 2015 at 4:23 PM, jun aoki <ja...@apache.org> wrote:
>
> > Hi Geode community
> >
> > Since the project code base is on git, I thought it would be
> > straightforward to have Default and the latest on "master", (which is
> git's
> > default latest branch name).
> > https://github.com/apache/incubator-geode/branches
> > shows "develop" is Default and most active.
> >
> > If we follow git convention, new comers (like me) would not be confused
> > which branch to work on.
> >
> > --
> > -jun
> >
>
>
>
> --
>
> William Markito Oliveira
>
> -- For questions about Apache Geode, please write to
> *dev@geode.incubator.apache.org
> <de...@geode.incubator.apache.org>*
>
--
-jun
Re: master to be default branch?
Posted by William Markito <wm...@pivotal.io>.
Hi Jun,
We decided to follow git-flow [1] conventions and by having default set
to develop allow us to close PR's once they're merged in develop, keeping
master with the latest stable/release code.
Although you're right that it can be confusing and we should update our
wiki with those decisions, now that they're made.
Thanks,
[1]
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/
[2] danielkummer.github.io/git-flow-cheatsheet/
[3] http://nvie.com/posts/a-successful-git-branching-model/
On Mon, Jun 15, 2015 at 4:23 PM, jun aoki <ja...@apache.org> wrote:
> Hi Geode community
>
> Since the project code base is on git, I thought it would be
> straightforward to have Default and the latest on "master", (which is git's
> default latest branch name).
> https://github.com/apache/incubator-geode/branches
> shows "develop" is Default and most active.
>
> If we follow git convention, new comers (like me) would not be confused
> which branch to work on.
>
> --
> -jun
>
--
William Markito Oliveira
-- For questions about Apache Geode, please write to
*dev@geode.incubator.apache.org
<de...@geode.incubator.apache.org>*