This is an automated email from the ASF dual-hosted git repository.
nchammas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 9911af1935ef [MINOR][INFRA] Allow "Squash and merge" only
9911af1935ef is described below
commit 9911af1935efdaac1fcbcde760719f75228f7416
Author: Nicholas Chammas <[email protected]>
AuthorDate: Mon Aug 31 08:21:45 2026 -0400
[MINOR][INFRA] Allow "Squash and merge" only
### 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](https://github.com/apache/spark-website/pull/707/changes#diff-b4c2a69650f9ac84008ad9f745859a645c9466350ffdfe5f919655039ee2e2c3).
### 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.
Closes #58342 from nchammas/enabled-merge-buttons.
Authored-by: Nicholas Chammas <[email protected]>
Signed-off-by: Nicholas Chammas <[email protected]>
---
.asf.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.asf.yaml b/.asf.yaml
index 650b82625266..7d20d200df17 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -32,7 +32,8 @@ github:
enabled_merge_buttons:
merge: false
squash: true
- rebase: true
+ squash_commit_message: PR_TITLE_AND_DESC
+ rebase: false
ghp_branch: master
ghp_path: /docs
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
