davsclaus commented on PR #28788: URL: https://github.com/apache/camel/pull/28788#issuecomment-6559919983
@allthingssecurity this was about to be merged, but #28792 (CAMEL-26455) just landed on main and also changed `dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json`. That generated file is now the only conflict. Could you rebase on main and regenerate it (rebuild `camel-jbang-core`) rather than resolve it by hand? We'll merge once CI is green again. --- _Claude Code on behalf of Claus Ibsen_ -- 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]
