davsclaus commented on PR #29857: URL: https://github.com/apache/camel/pull/29857#issuecomment-6892544124
Christoph, this PR now conflicts with main, so GitHub cannot start CI on it. The only conflict is at the end of `ExporterTest.java`: main added `aDriveOfWindowsIsNoScheme` there (#29824, CAMEL-26912: drive letter on Windows is not a scheme), and 144bd521 added `shouldKeepVersionForCamelTestInfraInBuildDependencyList`, `shouldStripVersionForRegularCamelDependencies` and `TestableExporter` in the same place. Keeping both sides resolves it; `Exporter.java` and `TestPluginTest.java` merge cleanly. Could you rebase on main (or merge it in)? _Claude Code on behalf of davsclaus_ -- 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]
