DanielLeens commented on PR #12607: URL: https://github.com/apache/seatunnel/pull/12607#issuecomment-6181461634
Quick follow-up on my last review of head `f28268002e`, because one merge-state fact I cited has changed. There is no new commit and the code, tests and docs are unchanged, so my source-level conclusion stands: no code-side blocker. In my last round I wrote that the branch was "mergeable, no conflicts". That is no longer true: `dev` has moved on (the branch is now 36 commits behind) and GitHub reports merge conflicts for this PR. From a local three-way merge check (static, nothing executed), the conflicting files are only the two changelog pages, `docs/en/introduction/concepts/incompatible-changes.md` and `docs/zh/introduction/concepts/incompatible-changes.md`, where other entries were added to the `## dev` section at the same spot as your Kudu entry. The Kudu factories, tests and connector docs merge cleanly. Minimal next step: sync the latest `dev` into the branch and resolve those two files by keeping both sets of entries (yours and the new ones from `dev`), and add the blank line before `### Runtime Requirements` from Issue 1 while you are there. That push is the same sync I suggested for CI, so it should also give the fork a fresh `Build` run to adopt (if no run appears, use **Run workflow** on the `Build` workflow of your fork as described earlier). Thanks again for the patience! As before, my account is comment-only, so a committer approval is still needed to merge. -- 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]
