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

ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f07e248d CASSANDRASC-143: Enable github squash in asf.yaml
f07e248d is described below

commit f07e248d0ce8303a06daf93b462190ef7be7304d
Author: Yifan Cai <[email protected]>
AuthorDate: Fri Aug 23 15:50:40 2024 -0700

    CASSANDRASC-143: Enable github squash in asf.yaml
    
    Patch by Yifan Cai; Reviewed by Francisco Guerrero, Stefan Miklosovic for 
CASSANDRASC-143
---
 .asf.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 8e8d3600..908b1262 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -25,9 +25,9 @@ github:
   description: "Sidecar for Apache Cassandra®"
   homepage: https://cassandra.apache.org/
   enabled_merge_buttons:
-    squash:  false
+    squash:  true
     merge:   false
-    rebase:  true
+    rebase:  false
   features:
     wiki: false
     issues: false
@@ -35,3 +35,8 @@ github:
   autolink_jira:
     - CASSANDRASC
     - CASSANDRA
+  protected_branches:
+    trunk:
+      required_status_checks:
+        # strict means "Require branches to be up-to-date before merging", 
i.e. enforcing rebase for the head branch.
+        strict: true


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to