[mergify] fix mergify config again (#3348)

elastic · Oct 6, 2023 · 85f1c39 · 85f1c39
1 parent 38150ba
commit 85f1c39
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,5 +1,7 @@
 queue_rules:
   - name: default
+  # merge method needs to be set to 'squash' to match the repository config
+    merge_method: squash
   # branch protection rules are automatically included, no extra rule needed for now
 
 pull_request_rules:
@@ -9,5 +11,4 @@ pull_request_rules:
       - base=main
     actions:
       queue:
-        merge_method: squash
         name: default