chore: fixup merge button settings

Signed-off-by: tison <wander4096@gmail.com>
apache · Oct 23, 2023 · 3e6a202 · 3e6a202
1 parent 0eabb75
commit 3e6a202
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -31,8 +31,8 @@ github:
     - hacktoberfest
   enabled_merge_buttons:
     squash: true
-    merge: true
-    rebase: false
+    rebase: true
+    merge: false
   protected_branches:
     main: {}