davsclaus commented on PR #29256: URL: https://github.com/apache/camel/pull/29256#issuecomment-6703672789
@JiriOndrusek this is approved and green and was about to be merged, but it now conflicts with `camel-4.18.x`, in `docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc` only. The camel-jsch backport (CAMEL-26066) added an entry at the same place. Could you rebase on `camel-4.18.x` and keep both entries? It can be merged once CI is green again. _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]
