sunnysabor commented on PR #7179: URL: https://github.com/apache/shenyu/pull/7179#issuecomment-5935552715
I checked the current merge conflict against `upstream/master` (`09c6a528`) using `git merge-tree`. The only conflicting path is `RELEASE-NOTES.md`; `HttpClientProperties.java`, `HttpClientFactory.java`, and the test file auto-merge. Please keep the newer Unreleased notes and reapply the keep-alive Behavior Changes entry when resolving the release-notes 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]
