From d5964dc02fc96e42a8f872ffd76c50ffdf630f92 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 6 May 2026 07:13:44 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .github/mergify.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 4d0948c..4addc65 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,4 +1,3 @@
----
 defaults:
   actions:
     queue:
@@ -8,7 +7,7 @@ defaults:
 
 queue_rules:
   - name: default
-    conditions:
+    merge_conditions:
       - check-success=test-lint
       - check-success=test-protoc
 
@@ -32,7 +31,6 @@ pull_request_rules:
     actions:
       queue: {}
       dismiss_reviews: {}
-      delete_head_branch: {}
 
   - name: design changes needs approval from at least one core maintainer
     conditions:
@@ -46,7 +44,6 @@ pull_request_rules:
     actions:
       queue: {}
       dismiss_reviews: {}
-      delete_head_branch: {}
 
   - name: label design changes (update the generated Go files)
     conditions: