From 6aef5d663820803b499d7e43b0a5e59666ce65b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 24 Jan 2025 00:43:51 +0000
Subject: [PATCH] Improve mergify config (#6852)

* improve mergify config

* negate conflict
---
 .github/mergify.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 9a74414e72f..1aa24f83020 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -18,6 +18,7 @@ pull_request_rules:
       - base=unstable
       - label=trivial
       - author=@sigp/lighthouse
+      - -conflict
     actions:
       review:
         type: APPROVE
@@ -26,11 +27,11 @@ pull_request_rules:
     conditions:
       # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
       - base=unstable
-      - label=ready-to-merge
+      - label=ready-for-merge
+      - label!=do-not-merge
     actions:
       queue:
 
-
 queue_rules:
   - name: default
     batch_size: 8
@@ -48,6 +49,7 @@ queue_rules:
       - "#approved-reviews-by >= 1"
       - "check-success=license/cla"
       - "check-success=target-branch-check"
+      - "label!=do-not-merge"
     merge_conditions:
       - "check-success=test-suite-success"
       - "check-success=local-testnet-success"