SEZ9 commented on PR #12862: URL: https://github.com/apache/seatunnel/pull/12862#issuecomment-6459617858
Thanks for the ping and for asking before touching the branch, @zhengxiang378928908-code. My recommendation: go ahead and rebase now rather than waiting. A conflict with `dev` blocks merging regardless of approval state, so an approval granted on `7b9d94255` would have to be refreshed after the rebase anyway. Resolving it first means the next approval can land on a head that is actually mergeable, and the queue step does not have to wait on a second round-trip. To keep the re-review as cheap as the last one, please do the same as you did for `36e16f44f` -> `7b9d94255`: 1. Keep the PR-owned commits byte-identical where possible and post the `git range-diff` summary against `7b9d94255` so we can see that only the conflict resolution changed. 2. Note which file(s) conflicted and how you resolved them; if it is the `incompatible-changes.md` (en/zh) ordering again, a one-line note is enough. 3. Trigger the fork `Build` on the new head and link the run here, the same way you did with https://github.com/zhengxiang378928908-code/seatunnel/actions/runs/40073956878. As before, nothing on the source side is outstanding from my previous review, and I am not asking for any code change beyond the conflict resolution. Once the new head and its Build link are posted, I will re-read the range-diff and record the result here so a write-capable committer can re-approve and re-enqueue in one pass. <!-- streview-comment:2089 --> -- 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]
