API v2 endpoint to get Pull Request conflict status

[IlyaFinkelshteyn]

Right now we are using API v1 and this path to get Pull Request conflict status:

repositories/{repoName}/pullrequests/{pullRequestId}/conflict-status

As API v1 is going to be discontinued, what API v2 endpoint should we use to get information if get PR has a conflict and can be merged? 

[Diego · Accepted solution]

Hello there Iliya!
I spoke with my colleagues over in Bitbucket about your case.
They showed me the option of using diffstat to your needs:

- Bitbucket API - diffstat

We tested it and the conflict check was there when we tried merging conflicting commits.

Let us know if this addresses your need!

[IlyaFinkelshteyn]

Just tried to use this API, it works. Thanks a lot!

[Diego]

That is wonderful Iliya! Glad to know that this new API has what you need.

If you ever need help, come get it with us at the Community!

[J7mboSixt]

Hey @Diegothanks for your answer! Exactly which is the field in here that indicates whether or not there are conflicts?

https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Busername%7D/%7Brepo_slug%7D/diffstat/%7Bspec%7D

[IlyaFinkelshteyn]

@J7mboSixt  It is values/status. Its value would be merge conflict in case of PR has a conflict.

[Mayank]

When hitting Get request on diffstat API, I'm only getting the differences for the PR not the merge conflicts status. In my case, the status is modified for the file having merge conflicts!

Any other way to check for the merge conflicts?

[Daniel Escaloni]

Same here @Diego  Is there an update or alternate solution?