On Wed, 17 Feb 2021 at 15:48, Laszlo Kishalmi <[email protected]> wrote: > The conflicts do not seems to be that serious, but we need to know how > to resolve them. What would be the source of truth the delivery branch > (a bunch of deletions) or the master?
Well, as far as I can tell, the only source of truth, if either branch, is master, otherwise it won't compile. This is partly that there's a number of open PRs that touch the same files. I want to make sure we get this tested / double-checked and in first, before one of those lands and we have to do this again. 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
