DanielLeens commented on PR #12015: URL: https://github.com/apache/seatunnel/pull/12015#issuecomment-5488587749
@luozihen thanks for flagging this proactively instead of just leaving CI red — that's exactly the right instinct, and this kind of accidental merge-into-feature-branch mistake is extremely common, so no need to apologize for the noise! My preference here is actually **option 2 (rebase), not option 1 (revert)** — and I'd suggest an even simpler variant than a manual interactive rebase: ```bash git fetch origin dev git rebase origin/dev # resolve any real conflicts if your own commits touch lines dev has since changed git push --force-with-lease ``` A plain (non-interactive) `git rebase origin/dev` will automatically drop the merge commit for you — rebase replays only the commits that are yours (not already reachable from `origin/dev`), and a merge commit whose "left" parent is already on `origin/dev` contributes no new patch of its own, so it gets skipped rather than replayed. You shouldn't need to hand-pick which commit to drop. Why rebase over revert in this specific case: - A revert commit cancels out the upstream changes in your branch's history, but it doesn't remove the merge commit itself — your branch still carries an extra merge commit *and* a revert commit, both of which are irrelevant to this PR's actual diff. That's more history noise, not less, and it can make the "Files changed" tab harder to read while this PR is under review. - Force-pushing here is safe: this is your own PR branch, nobody else has based work on top of it, and Apache SeaTunnel squash-merges PRs on landing anyway, so the interim commit history won't survive into `dev` either way. There's no shared-history risk that the usual "don't force-push" caution is meant to protect against. - A clean rebase means CI runs against exactly your feature diff on top of current `dev`, with nothing from a stale merge snapshot mixed in — which also makes it easier for me to confirm the green run actually reflects your changes when I re-review. Go ahead with the rebase + force-push, and ping me once CI is green again — I'll take another look. Thanks again for the careful contribution and for keeping the PR history clean, that's a great habit to build early! -- 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]
