From d55dc6de9247ad51937739d2e3295eca97a435fd Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Thu, 14 May 2020 16:15:01 +0530
Subject: [PATCH] ci: Add mergify rule for conflict

Added mergify rules to post a message
when there is conflict on the PR.

ref: https://doc.mergify.io/examples.html#request-for-action

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
---
 .mergify.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 15fd5333b..0e69730f6 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -7,6 +7,15 @@ pull_request_rules:
       dismiss_reviews:
         approved: true
         changes_requested: false
+  - name: ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        # yamllint disable-line rule:truthy
+        message: "This pull request now has conflicts with the target branch.
+        Could you please resolve conflicts and force push the corrected
+        changes? 🙏"
   - name: automatic merge
     conditions:
       - label!=DNM