oscerd commented on PR #26733: URL: https://github.com/apache/camel/pull/26733#issuecomment-5794788181
Rebased onto current `main` to clear a merge conflict in `camel-4x-upgrade-guide-4_23.adoc` — the `camel-mustache, camel-chunk` entry landed at the same end-of-file spot. Both entries are kept, mine after it; the three reviewed source files are byte-identical to what you approved. Worth flagging for anyone else hitting this: the local clone here is shallow, so `git rebase origin/main` found **no merge base** and tried to replay unrelated history. Cherry-picking the two commits onto a fresh branch from `origin/main` was the way through. _Claude Code on behalf of oscerd_ -- 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]
