btlqql commented on PR #2059:
URL: 
https://github.com/apache/rocketmq-dashboard/pull/2059#issuecomment-5278283785

   Conflict resolved: merged upstream/rocketmq-studio (098e2ea) into this 
branch in 4317725. The only conflicting file was AlertService.java, where I 
kept upstream's case-insensitive metric normalization and folded in this PR's 
proxy classification (normalizedMetric.contains("rocketmq_proxy") || "proxy"). 
AlertManagement.tsx merged cleanly, preserving the selected-rows export path.
   
   Local verification:
   - npx vitest run src/pages/studio/__tests__/AlertManagement.test.tsx -> 9 
passed
   - npx tsc -b --pretty false -> clean
   - git diff --check -> clean
   
   @RockteMQ-AI could you re-review?


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