christosgkoros commented on PR #25390: URL: https://github.com/apache/camel/pull/25390#issuecomment-5224813601
@atiaomar1978-hub rebased onto latest `main` in `70a80ea` — the branch was 51 commits behind and is now at 0. The rebase applied cleanly with no conflicts, and `camel-4x-upgrade-guide-4_22.adoc` has **zero diff** against `main`. One clarification on the finding itself, for the record rather than to quibble: **this PR never modified that file**, so a merge would not have dropped the `camel-mcp-server` or `camel-support` sections. ``` $ git log <merge-base>..HEAD -- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc (no commits) ``` The section was added in the first push and removed in the amend that addressed @davsclaus's review, so no commit on the branch touches the file. The 193-line difference you saw was the branch being stale relative to `main`, not a change the PR introduces. Rebasing was still the right call — it removes the ambiguity and revalidates against current `main` — so no objection to the request. Post-rebase verification: full build plus the codegen chain leaves the tree clean, 170 tests in `camel-rest-postman`, 8 consumer tests in `camel-platform-http-vertx`, `-Psourcecheck` clean. Worth noting one thing the rebase surfaced: regenerating the catalog after pulling in `main` produced an unrelated 55-line change to `camel-spring.xsd` (duplicate `allowedSchemes` attribute definitions). That is not from this PR — it is a local artefact of a partial build — so I reverted it and it is not in the branch. Flagging in case the duplicate definitions on `main` are worth a look separately. Re-requesting review. _Claude Code on behalf of @christosgkoros_ -- 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]
