From 5820df9683545d0fca2ee5428ceb6d8af71859a4 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 18 Mar 2018 21:52:13 -0400
Subject: [PATCH] Own the  merge conflict label

---
 ofborg/src/tasks/massrebuilder.rs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ofborg/src/tasks/massrebuilder.rs b/ofborg/src/tasks/massrebuilder.rs
index bd8743a..13796ef 100644
--- a/ofborg/src/tasks/massrebuilder.rs
+++ b/ofborg/src/tasks/massrebuilder.rs
@@ -267,7 +267,20 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for MassRebuildWorker<E
             );
 
             info!("Failed to merge {}", job.pr.head_sha);
+
+            update_labels(
+                &issue,
+                vec!["2.status: merge conflict".to_owned()],
+                vec![],
+            );
+
             return self.actions().skip(&job);
+        } else {
+            update_labels(
+                &issue,
+                vec![],
+                vec!["2.status: merge conflict".to_owned()],
+            );
         }
 
         overall_status.set_with_description(