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

   Heads-up: this branch picked up merge conflicts again after the last 
approval (`mergeStateStatus: DIRTY`), so CI cannot validate it against the 
current base.
   
   The conflict is in the discovery/upstream files this PR rewrites:
   `DiscoveryDataChangedEventSyncListener.java`, 
`DiscoveryUpstreamServiceImpl.java`, `UpstreamCheckService.java`, 
`LoadServiceDocEntryImpl.java`, `DiscoveryTransfer.java`, 
`CommonUpstreamUtils.java`.
   
   Please rebase onto `master` and keep the normalized-IPv6 behaviour from the 
approved revision (`98d81506`) intact — in particular the "skip unbracketed 
legacy record" contract in `handleAdded` and the `never(updateSelective)` 
assertion. I will re-approve and merge once the build is green.
   


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