From ba92d9dc2b9963052a68d71d75d37e59dd3f83fc Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 28 Aug 2021 23:17:55 +0200
Subject: [PATCH] ci(Mergify): configuration update

Signed-off-by: Francesco Gazzetta <fgaz@fgaz.me>
---
 .github/mergify.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 7449b8f155c..2fc66bded77 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,9 +1,16 @@
 pull_request_rules:
   - actions:
-      merge:
-        strict: smart+fasttrack
-        method: squash
-    name: Automatically merge pull requests
+      queue:
+        name: default
+        # Merge into master with a merge commit
+        method: merge
+        # Update the pr branch with rebase, so the history is clean
+        update_method: rebase
+    name: Put pull requests in the rebase+merge queue
     conditions:
       - label=merge me
-      - '#approved-reviews-by>=2'
\ No newline at end of file
+      - '#approved-reviews-by>=2'
+
+queue_rules:
+  - name: default
+    conditions: []