From 3229c4ac75369e0a4616cdbbde4bcbb5f543fee7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 2 Jul 2026 05:16:51 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .github/mergify.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 0b917b2546..fd9d53c5a0 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -12,8 +12,7 @@ pull_request_rules:
               - milestone~=v[0-9]\.[0-9]{2}
     actions:
       comment:
-        message: This pull request has merge conflicts. Could you please resolve them
-          @{{author}}? 🙏
+        message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏
       label:
         add:
           - waiting-on-author
@@ -105,7 +104,7 @@ queue_rules:
 
 
         {{ body | get_section("## Proposed Changes", "") }}
-      
+
       {% for commit in commits | unique(attribute='email_author') %}
       Co-Authored-By: {{ commit.author }} <{{ commit.email_author }}>
       {% endfor %}