From d75008c09889004bd9fe9ea683394f6eafc380aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Wed, 20 Nov 2024 16:12:22 +0000
Subject: [PATCH] add new features to mergify config

---
 .github/mergify.yml | 56 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 4c4046cf67a..7e77a7a8df8 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,15 +1,14 @@
-queue_rules:
-  - name: default
-    batch_size: 8
-    batch_max_wait_time: 60 s
-    checks_timeout: 10800 s
-    merge_method: squash
-    commit_message_template: |
-      {{ title }} (#{{ number }})
-      
-      {% for commit in commits %}
-      * {{ commit.commit_message }}
-      {% endfor %}
+defaults:
+  actions:
+    queue:
+      method: squash
+      commit_message_template: |
+        {{ title }} (#{{ number }})
+
+        {{ body | get_section("## Issue Addressed", "") }}
+
+
+        {{ body | get_section("## Proposed Changes", "") }}
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - "check-success=license/cla"
@@ -17,3 +16,36 @@ queue_rules:
     merge_conditions:
       - "check-success=test-suite-success"
       - "check-success=local-testnet-success"
+
+pull_request_rules:
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - or:
+        - -draft # Don't report conflicts on regular draft.
+    actions:
+      comment:
+        message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏
+
+  - name: Add to merge queue
+    conditions:
+      - label=add-to-queue
+      - base=master
+    actions:
+      queue:
+
+  - name: Approve trivial maintainer PRs
+    conditions:
+      - base=master
+      - label=trivial
+      - author=@sigp/lighthouse
+    actions:
+      review:
+        type: APPROVE
+
+queue_rules:
+  - name: default
+    batch_size: 8
+    batch_max_wait_time: 60 s
+    checks_timeout: 10800 s
+