SiriusTL666 commented on PR #12974: URL: https://github.com/apache/seatunnel/pull/12974#issuecomment-6463859060
Heads-up: the branch no longer merges cleanly into `dev`, so I have to touch it. Flagging this before I do, because I committed earlier to leaving `fcac22db` alone until the approval came through. **What changed.** `dev` moved on, and the only conflicts are in the two upgrade-notes files: `docs/en/introduction/concepts/incompatible-changes.md` and the ZH counterpart. Both sides added a new `###` section in the same place, so git cannot order them automatically. No source file, test, or connector doc conflicts — I verified with a test merge and those all merge cleanly: ``` Auto-merging docs/en/introduction/concepts/incompatible-changes.md CONFLICT (content): Merge conflict in docs/en/introduction/concepts/incompatible-changes.md Auto-merging docs/zh/introduction/concepts/incompatible-changes.md CONFLICT (content): Merge conflict in docs/zh/introduction/concepts/incompatible-changes.md ``` **What I will do.** Rebase onto current `dev`, keeping both entries and their order, then re-run the module tests. This produces a new head. Anything you ran against `fcac22db` will not transfer to it, so if you would rather approve and merge the current head as-is and let the conflict be someone else's single-line fix, say so and I will stop. Otherwise I will push the rebased head and report the new sha with fresh CI. **Why I am not just leaving it.** `mergeable` is `false` and the state is `dirty`, so the merge button is dead until this is resolved. A PR that cannot be merged will not be picked up, regardless of the approval. The technical content is unchanged — the same 15 files and the same tests, only the two notes files get re-ordered. (@davidzollo — same applies to your approval whenever you get to this; the rebase only touches documentation ordering.) -- 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]
