From eb8dcbda54ff3cd2b1024497539a783ca0fcbc12 Mon Sep 17 00:00:00 2001
From: Jason Song <i@wolfogre.com>
Date: Wed, 11 Sep 2024 17:46:56 +0800
Subject: [PATCH] chore: fix merge_method

---
 .github/mergify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index b2c0ae7..8d3a372 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -15,7 +15,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-        merge_method: squash
   - name: Handle merged
     conditions:
       - 'label=wait-merge'
@@ -27,6 +26,7 @@ pull_request_rules:
         remove: ["wait-merge"]
 queue_rules:
   - name: default
+    merge_method: squash
     merge_conditions:
       - check-success=testdata
       - check-success=build