On Tue, 18 Jun 2019 at 00:18, Junichi Yamamoto <[email protected]> wrote: > > Let's just revert it.
OK. Just replied on the PR. Revert button has disappeared, but feel free to revert, or I will later - first priority is first beta build. > 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. May I ask why? To solve a technical issue or a social issue? IMO all PRs still need to be against master in general, or we lose all the benefits of doing this. We're only talking about closing the merge window for a few weeks every few months. Merging pending PRs at the start of the merge window, rebased if necessary on top of bug fixes, surely makes some sense? There were a few people in favour of tagging master for at least non-LTS releases. We're not in a position we could do that yet anyway, but there are some merits to considering this as we speed up our release cycles. If there's a technical issue around collaboration or interdependent PRs, then we do need to consider either a short-lived "next" branch, or short-lived specific feature branches. You can edit any PR to change the base branch if there's a requirement for this. If it's a social issue - ie. better communication, then maybe we should have been a bit clearer in promoting the changes in process the new release schedule entails. That's at least partly my fault. I need to better link in the agreed plan wherever we may need it, including the repo readme - https://cwiki.apache.org/confluence/display/NETBEANS/Release+Schedule Within that release schedule, anything merged to master at any point, within the merge window or not, is intended for the next scheduled release. And master should always be releaseable as far as that is possible. 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
