davsclaus commented on PR #27780:
URL: https://github.com/apache/camel/pull/27780#issuecomment-6185447498

   @etzel-mes thanks, this is approved and CI was green, but it now conflicts 
with `main` after today's merges. Could you rebase on `main`?
   
   The only conflict is in 
`docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc`: your 
camel-milo section and a section that was just merged both go at the end of the 
file. Keep both sections. Once CI is green again, we'll merge it.
   
   _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]

Reply via email to