Merge develop to master?

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Merge develop to master?

Joe Witt
Hello

Does anyone feel that it would be a bad idea/mistake to periodically merge
develop into master as we work toward an initial release?

Our intent for 'master' is to reflect the latest release but since we as of
yet do not have a release master is not reflecting any of those changes.
The very first thing folks try to build or operate on is master.

I'm inclined to merge develop to master periodically just to help those
folks who may not realize that the 'develop' branch is where the fun is at.

Anyway...curious to hear others views.

Thanks
Joe
Reply | Threaded
Open this post in threaded view
|

Re: Merge develop to master?

Joey Echeverria
This is the part of the gitflow workflow that didn't make sense to me.
So many people are used to master being the main development branch
that it's weird to point people someplace else.

We do the same kind of thing in the Kite Examples project[1], and it's
always confusing to new folks trying to contribute. Maybe it'll be
less confusing once the first release is out.

One thing you can do, or maybe you need to as INFRA, is set the
develop branch as the main branch in github. I'm not sure if the ASF
git repo supports that notion or not, but I suspect a lot of folks
will use the github mirror anyway.

-Joey

[1] https://github.com/kite-sdk/kite-examples

On Tue, Dec 16, 2014 at 10:05 PM, Joe Witt <[hidden email]> wrote:

> Hello
>
> Does anyone feel that it would be a bad idea/mistake to periodically merge
> develop into master as we work toward an initial release?
>
> Our intent for 'master' is to reflect the latest release but since we as of
> yet do not have a release master is not reflecting any of those changes.
> The very first thing folks try to build or operate on is master.
>
> I'm inclined to merge develop to master periodically just to help those
> folks who may not realize that the 'develop' branch is where the fun is at.
>
> Anyway...curious to hear others views.
>
> Thanks
> Joe



--
Joey Echeverria
Reply | Threaded
Open this post in threaded view
|

Re: Merge develop to master?

Adam Taft
In reply to this post by Joe Witt
What's stopping you from releasing 0.0.1 on master?  Get the code to a
reasonable safe building spot and release it as 0.0.1.

NiFi doesn't need to be "done" to have a release; you don't need to jump
directly from 0.0.1 to 1.0.0.

I think "periodically" is a mistake (if by periodically, you basically mean
randomly).  I would instead suggest at least some form of stability on the
releases, so that at minimum, most everything at least hopefully builds on
the average platform.  We should get in the habit of targeting JIRA tickets
to milestones/releases and then moving to release.

Release early - release often.  0.x.y releases are meant to be previews.

Adam



On Tue, Dec 16, 2014 at 11:05 PM, Joe Witt <[hidden email]> wrote:

>
> Hello
>
> Does anyone feel that it would be a bad idea/mistake to periodically merge
> develop into master as we work toward an initial release?
>
> Our intent for 'master' is to reflect the latest release but since we as of
> yet do not have a release master is not reflecting any of those changes.
> The very first thing folks try to build or operate on is master.
>
> I'm inclined to merge develop to master periodically just to help those
> folks who may not realize that the 'develop' branch is where the fun is at.
>
> Anyway...curious to hear others views.
>
> Thanks
> Joe
>