Merge branch 'master' into mac-m1-jna-fix

apache · Nov 9, 2022 · 14365db · 14365db
2 parents 88eac48 + 8869c9e
commit 14365db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -29,7 +29,7 @@ github:
   #labels:
   enabled_merge_buttons:
     merge:  false
-    rebase: false
+    rebase: true
     squash: true
   protected_branches:
     master:
@@ -52,5 +52,5 @@ notifications:
   # before use the config, we should ensure the "mail" address has set well (exist)
   #pullrequests_comment: [email protected]
   #issues: [email protected]
-  #discussions:  [email protected]
+  #discussions: [email protected]