mirror of
https://git.vectorsigma.ru/public/atlantis.git
synced 2026-08-04 11:28:29 +00:00
Add comment for bitbucket merge conflict detection
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user