From 66ad2ccae1c0ebe71b91ed43121c7312407781ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Svantesson?= <Marten.Svantesson@ticket.se>
Date: Mon, 13 May 2024 17:02:37 +0200
Subject: [PATCH] fix: add github api value for conflict

---
 scm/driver/github/testdata/webhooks/pr_closed.json.golden    | 1 +
 scm/driver/github/testdata/webhooks/pr_edited.json.golden    | 1 +
 scm/driver/github/testdata/webhooks/pr_labeled.json.golden   | 1 +
 scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden | 1 +
 scm/pr.go                                                    | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scm/driver/github/testdata/webhooks/pr_closed.json.golden b/scm/driver/github/testdata/webhooks/pr_closed.json.golden
index 63465b769..de96aa57c 100644
--- a/scm/driver/github/testdata/webhooks/pr_closed.json.golden
+++ b/scm/driver/github/testdata/webhooks/pr_closed.json.golden
@@ -72,6 +72,7 @@
     "State": "closed",
     "Closed": true,
     "Merged": false,
+    "MergeableState": "conflicting",
     "Author": {
       "ID": 817538,
       "Login": "bradrydzewski",
diff --git a/scm/driver/github/testdata/webhooks/pr_edited.json.golden b/scm/driver/github/testdata/webhooks/pr_edited.json.golden
index ed1dddbdb..3ba50a9ea 100644
--- a/scm/driver/github/testdata/webhooks/pr_edited.json.golden
+++ b/scm/driver/github/testdata/webhooks/pr_edited.json.golden
@@ -72,6 +72,7 @@
     "State": "open",
     "Closed": false,
     "Merged": false,
+    "MergeableState": "conflicting",
     "Author": {
       "ID": 817538,
       "Login": "bradrydzewski",
diff --git a/scm/driver/github/testdata/webhooks/pr_labeled.json.golden b/scm/driver/github/testdata/webhooks/pr_labeled.json.golden
index e2fde1418..334e81e15 100644
--- a/scm/driver/github/testdata/webhooks/pr_labeled.json.golden
+++ b/scm/driver/github/testdata/webhooks/pr_labeled.json.golden
@@ -84,6 +84,7 @@
     "State": "open",
     "Closed": false,
     "Merged": false,
+    "MergeableState": "conflicting",
     "Author": {
       "ID": 817538,
       "Login": "bradrydzewski",
diff --git a/scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden b/scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden
index 645969d17..afb5883fe 100644
--- a/scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden
+++ b/scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden
@@ -77,6 +77,7 @@
     "State": "open",
     "Closed": false,
     "Merged": false,
+    "MergeableState": "conflicting",
     "Author": {
       "ID": 817538,
       "Login": "bradrydzewski",
diff --git a/scm/pr.go b/scm/pr.go
index 45bed6d85..df1184505 100644
--- a/scm/pr.go
+++ b/scm/pr.go
@@ -215,7 +215,7 @@ func ToMergeableState(text string) MergeableState {
 	switch strings.ToLower(text) {
 	case "clean", "mergeable", "can_be_merged":
 		return MergeableStateMergeable
-	case "conflict", "conflicting", "cannot_be_merged":
+	case "dirty", "conflict", "conflicting", "cannot_be_merged":
 		return MergeableStateConflicting
 	default:
 		return MergeableStateUnknown