Add comment for bitbucket merge conflict detection

This commit is contained in:
Luke Kysow
2019-06-12 12:28:52 +01:00
parent 5717de55f9
commit 91eecbcb68

View File

@@ -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
}