davsclaus commented on PR #25992: URL: https://github.com/apache/camel/pull/25992#issuecomment-5494938508
This PR is otherwise ready to merge (CI green, 2 approvals, milestone/labels set), but it now has a merge conflict against `main` in `docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc` — the Apache Avro 1.12.2 upgrade-guide section merged this morning landed at the same spot as this PR's `camel-dynamic-router` section. @oscerd could you rebase onto `main` and resolve (both sections should just be kept, one after the other)? Everything else (catalog JSON/adoc, endpoint-dsl builders) merges cleanly — it's only that one file. Will merge as soon as it's 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]
