squakez commented on PR #19497: URL: https://github.com/apache/camel/pull/19497#issuecomment-3388819090
You may need to rebase properly. Position on your last commit of the work, then `git pull --rebase upstream main` and likely fix the conflicts by removing those classes which no longer exists and are reported as conflict. -- 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]
