nielifeng commented on PR #11503: URL: https://github.com/apache/seatunnel/pull/11503#issuecomment-5313159250
Resolved the merge conflict by merging current `dev` (`65e32aa5d037`) into this branch. The new head is `a4d81044eee1`. The conflict resolution preserves both the recent comment-schema-change support from `dev` and this PR's checkpoint schema restore behavior. In particular, restore events still rebuild runtime schema state without reapplying physical DDL. Fresh local validation on the merged source: - API restore test: 1 passed, 0 failed - CDC restore tests: 7 passed, 0 failed - Flink `SchemaOperatorTest`: 6 passed, 0 failed - Elasticsearch compile, test compilation, Spotless, and package: `BUILD SUCCESS` - Java conflict-marker scan: clean The repeated failures on the previous head were unrelated Windows `engine-server` test startup failures (`BindException: Address already in use: JVM_Bind`) across three different test classes. A fresh CI run has now been triggered on the conflict-free head. -- 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]
