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: [email protected] 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: [email protected] > > For additional commands, e-mail: [email protected] > > For further information about the NetBeans mailing lists, visit: > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
