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

   Thanks @Dhairya-007, this is approved and ready to merge, but it now 
conflicts with main. #29954 (camel-docker deprecations) was merged and also 
adds a section at the end of 
`docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc`, and 
#29955, #29958 and #29959 each do the same. Could you rebase on main and keep 
both sections? Once one of the three is merged the next one conflicts again in 
the same place, so rebasing all three now and merging them one at a time may 
need another rebase in between.
   
   _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