[INFRA] Improve pull request merge tool - #7654
Open
pan3793 wants to merge 8 commits into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why are the changes needed?
This ports several useful improvements from Spark's merge tool, adapted to Kyuubi's GitHub-only workflow. It makes merges and backports safer, more traceable, and less error-prone for committers.
branch-1.12, thenbranch-1.11, and skip branches already picked.(y/N).How was this patch tested?
python3 -m py_compile dev/merge_kyuubi_pr.pypython3 -m doctest dev/merge_kyuubi_pr.pyblack --check dev/merge_kyuubi_pr.pygit diff --checkWas this patch assisted by generative AI tooling?
Assisted-by: Codex:GLM 5.3