add new features to mergify config

Author: jxs

.github/mergify.yml

@@ -1,19 +1,51 @@
-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"
       - "check-success=target-branch-check"
     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
+