k-krawczyk commented on PR #25409: URL: https://github.com/apache/camel/pull/25409#issuecomment-5258992514
Rebased onto `main` (`cd29991cf36d`) — the branch was 45 commits behind and had become conflicting. There was exactly one conflict, an add/add on `docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc`. When this PR was opened that file did not exist, so the PR created it; `main` has since been prepared for 4.23 and created the file itself, with a `camel-a2a` section. Both sections are kept, `camel-a2a` first, then `camel-archetypes`. Two follow-on effects of `main` catching up, both benign: - The PR no longer touches `camel-4x-upgrade-guide-4_22.adoc`. The entry was originally added there and moved to 4.23 in f9b9947; `main`'s 4.22 guide never had it, so the net diff against `main` is now empty for that file. - The PR no longer touches the upgrade guide index either — `main` added the `xref` for the 4.23 guide as part of preparing the branch, and the two changes coincided, so there is no duplicate link. Nothing outside the upgrade guide changed in the rebase: the diff against `main` is still the same 24 archetype files, +333/-104 in total. I re-checked that `camel-archetypes` appears once in the 4.23 guide, that all six `archetype-metadata.xml` files are well-formed and declare `README.md` and `AGENTS.md`, and that no source file still references `ReadMe.txt`. The verification section in the description was run before the rebase, against `4.22.0-SNAPSHOT`. I have not re-generated the six projects since; the rebase touched only the docs, so the generated output is unaffected. @davsclaus — you noted that this should wait until `main` was prepared for 4.23. That has happened (`main` is on `4.23.0-SNAPSHOT`), and the conflict is resolved, so this is ready to merge whenever it suits you. _Reported by Claude Code on behalf of Karol Krawczyk_ -- 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]
