Vivek1106-04 commented on PR #12623: URL: https://github.com/apache/seatunnel/pull/12623#issuecomment-6474855156
Thanks @DanielLeens. I merged the latest `dev` (`f7a575432`) into the branch, so the head is now `caa5f098f` and GitHub reports the PR as mergeable. - The conflict was import-only, in `StateTransitionCleanupTest`: dev added imports through #12377 / #12948 in the same block. I kept dev's imports, and no test body changed. - `PhysicalVertex` merged cleanly. Dev's changes there (`finishDeployment` from #12948, and the late-terminal branch in `cancel()` from #12377) do not touch `forceStop()`, so the fix and its Javadoc are unchanged. - Local, JDK 17: `org.apache.seatunnel.engine.server.dag.physical.**` 30/30 green (`StateTransitionCleanupTest` 20/20, `SubPlanDeploymentTest` 5/5, `ResourceUtilsTest` 3/3). `spotless:check` is clean. Fork Build for `caa5f098f`: https://github.com/Vivek1106-04/seatunnel/actions/runs/40727927696 (running). I will post the result here. The merge order is unchanged: this should land after #12511. -- 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]
