From 0b03f528291d8aca30bfd19efeb8b7f65c080591 Mon Sep 17 00:00:00 2001
From: Cynthia Lin <cynthialin1004@gmail.com>
Date: Thu, 30 Aug 2018 21:07:39 -0700
Subject: [PATCH] pull requests: Remove merge conflict labels during PR update
 checks.

---
 src/events/responses/pullState.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/events/responses/pullState.js b/src/events/responses/pullState.js
index 2d1fdf1..d76bdc0 100644
--- a/src/events/responses/pullState.js
+++ b/src/events/responses/pullState.js
@@ -118,6 +118,19 @@ exports.update = async function(pull, repo) {
     const deletable = await check(pull, repo);
     if (!deletable) continue;
 
+    const {label} = this.cfg.pulls.status.mergeConflicts;
+
+    if (label) {
+      try {
+        await this.issues.removeLabel({
+          owner: repoOwner, repo: repoName, number: number, name: label
+        });
+      } catch (e) {
+        // although we could attempt to fetch labels of the pull request,
+        // it's an extra API call, so we silently ignore the error instead.
+      }
+    }
+
     const comments = await template.getComments({
       number: number, owner: repoOwner, repo: repoName
     });