From b20eb6d155cd696cf69029addd17de03130a1ba0 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 21 Sep 2018 19:55:23 -0400
Subject: [PATCH] Throw a JobException on PR merge conflicts

It's just saner this way
---
 src/Tgstation.Server.Host/Controllers/RepositoryController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
index 3ca9664847..f8efbfb785 100644
--- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
+++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
@@ -685,8 +685,8 @@ namespace Tgstation.Server.Host.Controllers
 
 									var mergeResult = await repo.AddTestMerge(I, committerName, currentModel.CommitterEmail, currentModel.AccessUser, currentModel.AccessToken, NextProgressReporter(), ct).ConfigureAwait(false);
 
-									if (!mergeResult.HasValue)  //conflict, we don't care, dd already knows
-										continue;
+									if (!mergeResult.HasValue)
+										throw new JobException(String.Format(CultureInfo.InvariantCulture, "Merge of PR #{0} at {1} conflicted!", I.Number, I.PullRequestRevision.Substring(0, 7)));
 
 									++doneSteps;