Let's just revert it. I think we need the new branch for merging PRs unrelated to NB 11.1 because the current PRs are set 'master' as the base branch. The same thing may happen again.
Thanks, Junichi On Tue, Jun 18, 2019 at 4:07 AM Neil C Smith <[email protected]> wrote: > > On Mon, 17 Jun 2019 at 19:37, Geertjan Wielenga <[email protected]> wrote: > > > > So where should that PR 1301 go, i.e., I guess, it should not be merged at > > all unless it should go into 11.1? > > Ideally, no, particularly because it's intended for 11.2 anyway. In > general, it depends where the urge to merge comes from. If a PR is > fairly standalone, then we tag it with NB11.2 and merge when the > window reopens after the release, after the spec version update and on > top of any bug fixes. > > OTOH, as Jan, I and others discussed here, there might be a need to > consider a short-lived "next" branch (or in my opinion various feature > grouped branches) to allow for collaboration while master is closed. > We agreed to review after NB 11.1 release, and during if it poses a > problem earlier. > > In respect of PR 1301 need to consider whether to revert the commit > and reapply later, or whether the code is OK to remain in place. > Either way, it won't be in first beta now. > > Best wishes, > > Neil > > --------------------------------------------------------------------- > 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
