neilcsmith-net opened a new pull request, #6672: URL: https://github.com/apache/netbeans/pull/6672
Make sure to pass the attributes for all 3 trees in CherryPickCommand.FailuresDetectRecursiveStrategy. This can be seen in the docs and usage of this method inside https://git.eclipse.org/c/jgit/jgit.git/tree/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java (no comment on how horrible an API that is!) Fix for #6668 Not sure what the status of libs.git tests are? I noticed they're still commented out in CI. Also took the chance, as it's a private class, to correct the spelling in the name. -- 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. To unsubscribe, e-mail: [email protected] 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
