You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2021/02/17 14:51:41 UTC

[GitHub] [netbeans] neilcsmith-net opened a new pull request #2770: Sync delivery to master post 12.3-beta3 with conflicts resolved

neilcsmith-net opened a new pull request #2770:
URL: https://github.com/apache/netbeans/pull/2770


   This replaces #2749 for merging delivery to master resolving conflicts in the files - 
   
   ``
   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 
   ```
   
   As @matthiasblaesing noticed, using git's merge resolution results in an uncompileable state, so both these files were retained as is from the master branch.
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

[GitHub] [netbeans] neilcsmith-net merged pull request #2770: Sync delivery to master post 12.3-beta3 with conflicts resolved

Posted by GitBox <gi...@apache.org>.
neilcsmith-net merged pull request #2770:
URL: https://github.com/apache/netbeans/pull/2770


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

[GitHub] [netbeans] entlicher edited a comment on pull request #2770: Sync delivery to master post 12.3-beta3 with conflicts resolved

Posted by GitBox <gi...@apache.org>.
entlicher edited a comment on pull request #2770:
URL: https://github.com/apache/netbeans/pull/2770#issuecomment-780731772


   The two files need to be merged and not replaced. If this is merged as it is, I can follow-up with a PR that merges these two files.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

[GitHub] [netbeans] matthiasblaesing commented on pull request #2770: Sync delivery to master post 12.3-beta3 with conflicts resolved

Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on pull request #2770:
URL: https://github.com/apache/netbeans/pull/2770#issuecomment-780736128


   I would merge as is, as @entlicher already indicated, that he'll "fix" the merged variant.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

[GitHub] [netbeans] entlicher edited a comment on pull request #2770: Sync delivery to master post 12.3-beta3 with conflicts resolved

Posted by GitBox <gi...@apache.org>.
entlicher edited a comment on pull request #2770:
URL: https://github.com/apache/netbeans/pull/2770#issuecomment-780731772


   The two files need to be merged and not replaced. If this PR is merged as it is, I can follow-up with a PR that merges these two files.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

[GitHub] [netbeans] entlicher commented on pull request #2770: Sync delivery to master post 12.3-beta3 with conflicts resolved

Posted by GitBox <gi...@apache.org>.
entlicher commented on pull request #2770:
URL: https://github.com/apache/netbeans/pull/2770#issuecomment-780731772


   The two files needs to be merged and not replaced. If this is merged as it is, I can follow-up with a PR that merges these two files.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

[GitHub] [netbeans] neilcsmith-net commented on pull request #2770: Sync delivery to master post 12.3-beta3 with conflicts resolved

Posted by GitBox <gi...@apache.org>.
neilcsmith-net commented on pull request #2770:
URL: https://github.com/apache/netbeans/pull/2770#issuecomment-780738960


   OK, merging, thanks.  Tests all OK.  @entlicher - for info, I left as is in master, so they weren't replaced by the delivery branch - not sure there is anything to merge in, but also didn't look in depth why the subsequent PR to delivery had removed those methods.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists