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: [email protected] --------------------------------------------------------------------- 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
