Dhairya-007 commented on PR #29954: URL: https://github.com/apache/camel/pull/29954#issuecomment-6892703639
Merged current `main` in to clear the conflict in `camel-4x-upgrade-guide-4_24.adoc` — several sections landed there since this branch was cut. The resolution is a plain union: main's sections in place, the `=== camel-docker` one appended last, and I checked the file byte-for-byte against main's copy plus that one section. No other file conflicted. -- 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]
