mergify: replace queue action for queue_rules (#14044)

elastic · Sep 11, 2024 · f085632 · f085632
1 parent 0c92c81
commit f085632
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,5 +1,6 @@
 queue_rules:
   - name: default
+    merge_method: squash
     conditions:
       - check-success=test (macos-latest)
       - check-success=test (windows-latest)
@@ -150,7 +151,6 @@ pull_request_rules:
       - -conflict
     actions:
       queue:
-        method: squash
         name: default
   - name: delete updatecli branch after merging/closing it
     conditions:
@@ -213,7 +213,6 @@ pull_request_rules:
       - -conflict
     actions:
       queue:
-        method: squash
         name: default
   - name: backport patches to 8.5 branch
     conditions: