You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by Laszlo Kishalmi <la...@gmail.com> on 2018/06/03 20:32:37 UTC
PR-s for release90
Hi all!
What shall be the PR creation strategy regarding release90. I'm having a
real harmless NPE patch
https://github.com/apache/incubator-netbeans/pull/574
Right now I made the PR against the release90 branch. Shall I do it
against the master as well?
BTW what is our branch handling strategy for release? We branch, alter
the required changes (branding, etc.), and cherry pick from master?
In this case how shall we decide which PR shall go to the release branch
as well?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: PR-s for release90
Posted by Junichi Yamamoto <ju...@gmail.com>.
Hi Laszlo,
I suppose that we should create PRs against both master and release90
branches if they need that change.
Or first of all, we should create a PR against the master branch. Then
we should backport it to the release90 branch.
I actually created PRs: https://github.com/apache/incubator-netbeans/pull/566
This is Jan's PR: https://github.com/apache/incubator-netbeans/pull/565
Thanks,
Junichi
On Mon, Jun 4, 2018 at 5:32 AM Laszlo Kishalmi
<la...@gmail.com> wrote:
>
> Hi all!
>
> What shall be the PR creation strategy regarding release90. I'm having a
> real harmless NPE patch
> https://github.com/apache/incubator-netbeans/pull/574
>
> Right now I made the PR against the release90 branch. Shall I do it
> against the master as well?
>
> BTW what is our branch handling strategy for release? We branch, alter
> the required changes (branding, etc.), and cherry pick from master?
>
> In this case how shall we decide which PR shall go to the release branch
> as well?
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
AW: PR-s for release90
Posted by Christian Lenz <ch...@gmx.net>.
If we want to go with gitlflow, as someone mentioned it some months ago, this will explain it best I think: https://nvie.com/posts/a-successful-git-branching-model/
Sure, maybe we will not exact follow the workflow, but we can adapt it.
Cheers
Chris
Von: Emilian Bold
Gesendet: Montag, 4. Juni 2018 07:21
An: dev@netbeans.incubator.apache.org
Betreff: Re: PR-s for release90
> What shall be the PR creation strategy regarding release90. I'm having a
> real harmless NPE patch
> https://github.com/apache/incubator-netbeans/pull/574
> Right now I made the PR against the release90 branch. Shall I do it
> against the master as well?
I'd say yes. Right now the patch is going to be identical but if the branches start diverging the patches will be different and it would be good to review that.
> BTW what is our branch handling strategy for release? We branch, alter
> the required changes (branding, etc.), and cherry pick from master?
Yes.
> In this case how shall we decide which PR shall go to the release branch
> as well?
Fixes should go in both master and the release branch for obvious reasons. New features won't generally be cherry-picked into the release branch.
If unsure, we can always vote.
--emi
>
>
> --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
>
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
>
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
>
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: PR-s for release90
Posted by Emilian Bold <em...@protonmail.ch>.
> What shall be the PR creation strategy regarding release90. I'm having a
> real harmless NPE patch
> https://github.com/apache/incubator-netbeans/pull/574
> Right now I made the PR against the release90 branch. Shall I do it
> against the master as well?
I'd say yes. Right now the patch is going to be identical but if the branches start diverging the patches will be different and it would be good to review that.
> BTW what is our branch handling strategy for release? We branch, alter
> the required changes (branding, etc.), and cherry pick from master?
Yes.
> In this case how shall we decide which PR shall go to the release branch
> as well?
Fixes should go in both master and the release branch for obvious reasons. New features won't generally be cherry-picked into the release branch.
If unsure, we can always vote.
--emi
>
>
> --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
>
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
>
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
>
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists