From ea56aac84433d9703cb1be481be2f0aa7f59494b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=BD=94=EB=94=A9=ED=95=98=EB=8A=94=ED=8E=AD=EA=B7=84?=
 <coodingpenguin@gmail.com>
Date: Thu, 15 Jul 2021 14:29:29 +0900
Subject: [PATCH] ci(Mergify): configuration update

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

diff --git a/.mergify.yml b/.mergify.yml
index 1702652..1101cee 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -28,3 +28,25 @@ pull_request_rules:
     actions:
       merge:
         method: merge
+
+  - name: Add conflict label
+    conditions: 
+      - -closed
+      - -merged
+      - conflict
+    actions:
+      comment:
+        message: "@{{author}} Conflict 해결이 필요합니다!😥"
+      label:
+        add:
+          - conflict
+
+  - name: Remove conflict label
+    conditions:
+      - -closed
+      - -merged
+      - -conflict
+    actions:
+      label:
+        remove:
+          - conflict