From 666258f9ba90ba362a531de5e45458f6449a18db Mon Sep 17 00:00:00 2001
From: The Apache Software Foundation <root-asf-gitbox-commits@apache.org>
Date: Fri, 15 May 2026 17:55:17 -0500
Subject: [PATCH 1/2] Set up default protection ruleset for default and release
 branches

---
 .asf.yaml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index afc9a60a..be8911c6 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -28,6 +28,19 @@ github:
     - kubernetes
     - helm
   enabled_merge_buttons:
-    squash:  true
-    merge:   false
-    rebase:  false
+    squash: true
+    merge: false
+    rebase: false
+  rulesets:
+    - name: "Default Branch Protection"
+      type: branch
+      branches:
+        includes:
+          - "~DEFAULT_BRANCH"
+          - "release/*"
+          - "rel/*"
+        excludes: []
+      bypass_teams:
+        - root
+      restrict_deletion: true
+      restrict_force_push: true

From 8590411d0dd077931608a2335511b3ef0196d81f Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Sat, 16 May 2026 11:57:05 +0800
Subject: [PATCH 2/2] Update .asf.yaml

---
 .asf.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index be8911c6..59b5b1f0 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -38,7 +38,6 @@ github:
         includes:
           - "~DEFAULT_BRANCH"
           - "release/*"
-          - "rel/*"
         excludes: []
       bypass_teams:
         - root