sunnysabor commented on PR #7344: URL: https://github.com/apache/shenyu/pull/7344#issuecomment-5935843118
I also checked the current merge conflict against `upstream/master` (`09c6a528`) and head `cca4e49b` with `git merge-tree`. The only conflicting path is `ShenyuWebsocketClient.java`; the test file and all other changed paths auto-merge. This should keep the rebase resolution localized to combining the client changes. -- 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]
