Aias00 commented on PR #7811: URL: https://github.com/apache/shenyu/pull/7811#issuecomment-6281931743
This PR still has a **merge conflict with `master`** (`mergeable: false`). I can see new commits were pushed after my earlier review, but the branch has not been rebased onto the current `master`, so the conflict remains and it cannot be merged. Please rebase onto the latest `master` and resolve the conflicts, then force-push the branch: ``` git fetch upstream git rebase upstream/master # resolve conflicts, then: git push --force-with-lease ``` Once the conflict is cleared (and `mergeable` returns `true`), I will re-review the resolved code. Thanks! -- 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]
