[arrow-cookbook] branch main updated: [Dev] Configure merge to only allow Squash and merge (#282)

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-cookbook.git


The following commit(s) were added to refs/heads/main by this push:
     new b7726ad  [Dev] Configure merge to only allow Squash and merge (#282)
b7726ad is described below

commit b7726adeb1e16914571e12dccafb1af112d05fa3
Author: Raúl Cumplido <ra...@gmail.com>
AuthorDate: Wed Dec 14 22:21:02 2022 +0100

    [Dev] Configure merge to only allow Squash and merge (#282)
    
    This also changes issues open and closed notifications to issues@ .
---
 .asf.yaml       | 5 +++++
 CONTRIBUTING.md | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index d18c83f..a236cf9 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -16,6 +16,10 @@
 # under the License.
 
 github:
+  enabled_merge_buttons:
+    merge: false
+    rebase: false
+    squash: true
   features:
     issues: true
   protected_branches:
@@ -26,6 +30,7 @@ github:
 
 notifications:
   commits:      commits@arrow.apache.org
+  issues_status: issues@arrow.apache.org
   issues:       github@arrow.apache.org
   pullrequests: github@arrow.apache.org
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fe45338..c9cbef7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,3 +55,8 @@ how to make your recipes testable.
 All participation in the Apache Arrow project is governed by the Apache
 Software Foundation’s [code of
 conduct](https://www.apache.org/foundation/policies/conduct.html).
+
+## Merging Pull Requests
+
+We use the GitHub UI to merge Pull Requests instead of a script as we do on the
+main Arrow repository. The repo is configured to use `Squash and merge`.