SEZ9 commented on PR #12366: URL: https://github.com/apache/seatunnel/pull/12366#issuecomment-6407511638
Following up on my earlier note about the merge conflicts against `dev`. From what's now on the thread, the sync has been done: the only commit since `ab3fcc09` is the dev merge `516b855e`, the PR-touched source, test and E2E files are byte-identical to the previous head, and the only differences are `dev`-originated entries in the incompatible-changes docs and the ZH Paimon sink doc. The latest comparison also reports `merge conflicts: no`, so the conflict that dropped this out of the merge queue appears resolved. Thanks for taking care of that. Two small asks to close this point out: 1. Could you confirm in a quick comment that the merge at `516b855e` was a plain `dev` merge with no manual conflict resolution inside the PR's own files? The automated comparison says so, but I'd like that stated by you since you did the merge. 2. The branch is still `diverged` (ahead 10 / behind 14). That by itself is not a blocker and I'm not asking for a re-sync just to reduce drift — but if `dev` moves on again before this is merged and GitHub flags a conflict once more, please do another plain merge rather than a rebase so the review history stays intact. Nothing else from the merge-conflict point remains open on my side. <!-- streview-comment:2045 --> -- 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]
