[MINOR][INFRA] Allow "Squash and merge" only - #58342
Open
nchammas wants to merge 1 commit into
Open
Conversation
| squash: true | ||
| rebase: true | ||
| squash_commit_message: PR_TITLE_AND_DESC | ||
| merge: false |
Member
There was a problem hiding this comment.
This is unchanged, isn't it? It would be great if we minimize the git diff by keeping merge: false at the top, @nchammas .
Contributor
Author
There was a problem hiding this comment.
Yes, I deliberately moved it so that the one enabled merge method is at the top, and so that this config block matches spark-website. If you feel strongly about minimizing the diff I'll make the change.
Member
There was a problem hiding this comment.
I prefer strongly to minimize the diff.
Member
There was a problem hiding this comment.
Yeah let's make the diff small. otherwise I am fine with this change
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
3 participants
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.
What changes were proposed in this pull request?
When using GitHub's merge button (which we don't use), allow "Squash and merge" only, where the squashed commit title and message are derived from the PR title and description.
GitHub unfortunately does not allow us to disable the merge button entirely.
Relevant docs are here: https://github.com/apache/infrastructure-asfyaml/blob/main/README.md#merge
Why are the changes needed?
They're not really needed, but if we ever decide to use GitHub's merge button, or if someone uses it by mistake, the updated settings are the closest to what our merge script does. They also match what is proposed for spark-website.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
No testing.
Was this patch authored or co-authored using generative AI tooling?
No.