From 85f1c3944100cd72ad0bcf97afec21613de69f7e Mon Sep 17 00:00:00 2001
From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com>
Date: Fri, 6 Oct 2023 11:31:16 +0200
Subject: [PATCH] [mergify] fix mergify config again (#3348)

---
 .mergify.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 12c93945ad..95facf62c5 100644
--- 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