Aias00 commented on PR #7820:
URL: https://github.com/apache/shenyu/pull/7820#issuecomment-6308200982

   Heads-up: this branch now has merge conflicts with `master` 
(`mergeStateStatus: DIRTY`), so CI cannot validate it against the current base.
   
   The conflict is in the files you touch, which have both moved recently:
   `shenyu-plugin/.../divide/DividePlugin.java` and `DividePluginTest.java`.
   
   Please rebase onto `master` and re-run the divide tests locally — the 
circuit-breaker candidate handling in `doExecute` has changed in that window, 
so a mechanical conflict resolution may not compile. Happy to re-review once 
pushed.
   


-- 
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]

Reply via email to