From 73333b450e5594d25594121a5fcf74874769b26f Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Wed, 24 Nov 2021 11:58:11 +0000
Subject: [PATCH] [mergify]: notify conflicts in PRs that are still open
 (#29122)

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

diff --git a/.mergify.yml b/.mergify.yml
index 15ef4cd538a..d2ee975b7e1 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -14,6 +14,8 @@ pull_request_rules:
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
   - name: ask to resolve conflict
     conditions:
+      - -merged
+      - -closed
       - conflict
     actions:
         comment: