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

   Heads-up: this branch now has merge conflicts with `master` 
(`mergeStateStatus: DIRTY`), so CI cannot validate it against the current base.
   
   The conflict spans the discovery/upstream path you touch:
   `DiscoveryDataChangedEventSyncListener.java`, 
`AbstractDiscoveryProcessor.java`, `discovery-upstream-sqlmap.xml`, 
`UpstreamCacheManager.java`, `Upstream.java`.
   
   Please rebase onto `master` — the discovery upstream reconciliation and the 
loadbalancer cache both changed in that window, so please re-verify the "sync 
upstream changes for existing instances" behaviour against the current code 
rather than resolving mechanically. I will 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