The two files are:
#
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
#
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
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?
On 2/17/21 7:09 AM, Neil C Smith wrote:
Hi,
I've just had a look at tidying up the sync PR to get changes from
delivery into master - https://github.com/apache/netbeans/pull/2770
Can we prioritise getting that checked and in before merging anything
else, particularly in the LSP space?
There are a number of methods that were added earlier in 12.3 then
deleted that are in use in the master branch. To get in a compilable
state, I've preferred two files as they are in master. Best to get
this in and sorted before there's any further divergence.
Thanks and 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
