From 42a93d8a5f857502b970a903a2d6c3f08d616bef Mon Sep 17 00:00:00 2001
From: zakir <80246097+zakir-code@users.noreply.github.com>
Date: Fri, 30 Aug 2024 18:55:13 +0800
Subject: [PATCH 1/2] ci(Mergify): configuration update

Signed-off-by: zakir <null>
---
 .mergify.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 00000000..e6570bd4
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,45 @@
+queue_rules:
+  - name: default
+    queue_conditions:
+      - "#approved-reviews-by>1"
+
+pull_request_rules:
+  - name: Automatic merge
+    description: Merge when PR passes all branch protection and has label automerge
+    conditions:
+      - "#approved-reviews-by>1"
+      - base=main
+      - label = automerge
+    actions:
+      queue:
+        name: default
+        update_method: merge
+        merge_method: squash
+        commit_message_template: |
+            {{ title }} (#{{ number }})
+  - name: backport patches to v7.5.x branch
+    conditions:
+      - base=main
+      - label=backport/v7.5.x
+    actions:
+      backport:
+        branches:
+          - release/v7.5.x
+  - name: Ping PR author when conflicting
+    description: Warn the pull request author when their PR are conflicting
+    conditions:
+      - conflict
+      - '-closed'
+    actions:
+      comment:
+        message: >
+          👋 {{author}} your PR is conflicting and needs to be updated to be
+          merged
+  - name: Add a queue label when PR is queued
+    description: Toggle the queue label when a pull request is (un)queued.
+    conditions:
+      - queue-position > 0
+    actions:
+      label:
+        toggle:
+          - merge-queued
\ No newline at end of file

From a038edd93c11760b079d586a373d38c158062610 Mon Sep 17 00:00:00 2001
From: zakir <80246097+zakir-code@users.noreply.github.com>
Date: Mon, 2 Sep 2024 15:15:25 +0800
Subject: [PATCH 2/2] update

---
 .mergify.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index e6570bd4..d7af7b4b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,13 +1,13 @@
 queue_rules:
   - name: default
     queue_conditions:
-      - "#approved-reviews-by>1"
+      - "#approved-reviews-by>=2"
 
 pull_request_rules:
   - name: Automatic merge
     description: Merge when PR passes all branch protection and has label automerge
     conditions:
-      - "#approved-reviews-by>1"
+      - "#approved-reviews-by>=2"
       - base=main
       - label = automerge
     actions: