Gimini-3 commented on PR #39534: URL: https://github.com/apache/shardingsphere/pull/39534#issuecomment-6117065954
Resolved the merge conflicts with the current `master` and pushed cdd305773f3. This also includes the Spotless blank-line fix from f58ac10a621. On the merged candidate, targeted Spotless selected all three changed Java files and found no changes needed, Checkstyle reported 0 violations, and the focused generator and condition-engine tests passed (40 tests, 0 failures/errors) with JDK 25. GitHub now reports the PR as conflict-free (`mergeable: true`). The full Maven check was not run locally. Please re-review when convenient; CI and the remaining merge requirements still need to complete. -- 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]
