Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Get started Tell me more

Atlassian Community about banner

4,556,538

Community Members

Community Events

184

Community Groups

Community
Products
Bitbucket
Questions
API v2 endpoint to get Pull Request conflict status

API v2 endpoint to get Pull Request conflict status

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?

1 answer

1 accepted

1 vote

Answer accepted

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!

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Like

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!

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Like

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Like • Bogdan Derevyaga likes this

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Like

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?

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Like • Andrei Solntsev likes this

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Like • like this

Reply

Suggest an answer

Log in or Sign up to answer

Was this helpful?

Thanks!

TAGS