davsclaus commented on code in PR #28055: URL: https://github.com/apache/camel/pull/28055#discussion_r4307386075
########## docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc: ########## @@ -11,6 +11,33 @@ Note that manual migration is still required. See the xref:camel-upgrade-recipes-tool.adoc[documentation] page for details. ==== +== Upgrading from 4.22.2 to 4.22.3 Review Comment: #28052 adds this same `== Upgrading from 4.22.2 to 4.22.3` heading at the same line, for the elasticsearch and opensearch notes. `git merge-tree` reports a conflict between the two PRs in this file. Whichever merges second needs a rebase that keeps one 4.22.3 heading with the milo note and those three notes under it. -- 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]
