Add comment for bitbucket merge conflict detection

runatlantis · Jun 12, 2019 · 91eecbc · 91eecbc
1 parent 5717de5
commit 91eecbc
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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
 			}