From 91eecbcb683dd46bd71990cd4637c78ba3a9cb62 Mon Sep 17 00:00:00 2001
From: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Date: Wed, 12 Jun 2019 12:28:52 +0100
Subject: [PATCH] Add comment for bitbucket merge conflict detection

---
 server/events/vcs/bitbucketcloud/client.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/events/vcs/bitbucketcloud/client.go b/server/events/vcs/bitbucketcloud/client.go
index 8667581751..3bb48b2cec 100644
--- a/server/events/vcs/bitbucketcloud/client.go
+++ b/server/events/vcs/bitbucketcloud/client.go
@@ -143,6 +143,7 @@ func (b *Client) PullIsMergeable(repo models.Repo, pull models.PullRequest) (boo
 			return false, errors.Wrapf(err, "API response %q was missing fields", string(resp))
 		}
 		for _, v := range diffStat.Values {
+			// These values are undocumented, found via manual testing.
 			if *v.Status == "merge conflict" || *v.Status == "local deleted" {
 				return false, nil
 			}