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/04/07 06:22:53 UTC
[GitHub] [netbeans] vieiro opened a new pull request #2871: [NETBEANS-4663][CND] ResolveConflictExecutor in mercurial/subversion remote
vieiro opened a new pull request #2871:
URL: https://github.com/apache/netbeans/pull/2871
Reusing/adapting ResolveConflictsExecutor.java from ide/subversion and ide/mercurial into dlight/subversion.remote and dlight/mercurial.remote, respectively.
With this PR dlight/subversion.remote and dlight/mercurial.remote seem to compile and test properly, but we may need to review how well they work once CND runs in the IDE.
--
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] vieiro merged pull request #2871: [NETBEANS-4663][CND] ResolveConflictExecutor in mercurial/subversion remote
Posted by GitBox <gi...@apache.org>.
vieiro merged pull request #2871:
URL: https://github.com/apache/netbeans/pull/2871
--
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] vieiro commented on pull request #2871: [NETBEANS-4663][CND] ResolveConflictExecutor in mercurial/subversion remote
Posted by GitBox <gi...@apache.org>.
vieiro commented on pull request #2871:
URL: https://github.com/apache/netbeans/pull/2871#issuecomment-821529407
@matthiasblaesing Fully agree. The plan with CND is to clear all licensing issues (in case we want to reuse in CPPLITE), then make it compile, then make it run and then test. There's a long road ahead, I'm afraid. Merging.
--
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