Best way to automatically detect when a pull request resulted in conflict?

I need to detect when a pull request couldn't be merged because of merge conflicts (as soon as possible). Do I have to poll the log files or is there any better way?

 Best way would be a plugin that is triggered on a conflicting pull request.

2 answers

1 accepted

This widget could not be displayed.

Hi Andreas,

Depending on your use case, you could poll the list of open Pull Requests via the REST API:

/rest/api/1.0/projects/{projectKey}/repos/{repositorySlug}/pull-requests

and then use the merge status end-point at:

/rest/api/1.0/projects/{projectKey}/repos/{repositorySlug}/pull-requests/{pullRequestId}/merge

to determine which are conflicted.

I'd stagger how quickly you call merge end-point though. Calculating merge results can be a very expensive operation, depending on the size of the PR, so calling it to rapidly may hurt performance.

cheers,

Tim

Is the merge processed multiple times when I call this REST resource? When I open the Pull Request via Browser/HTML the merge is processed only one time. Every further call of the Pull Requests page does not trigger any Git activities in the background afaik.

The result is cached permanently, but calling it in quick succession for different PRs for which the merge result hasn't been calculated (of the same PR if the source or target branch is updated) could get expensive.

I only have to retrieve the merge result for a few branches and only for Pull Requests that are still open, so I think this will be reasonable costs. I will give it a try and share my experience here. Thank you Tim.

The Jenkins job that I'am using to retrieve information about the Pull Requests needs 2 seconds to complete. Thats absolutely acceptable.

Nice one! Thanks for sharing.

This widget could not be displayed.

Link: https://community.atlassian.com/t5/Bitbucket-questions/REST-API-how-to-check-if-a-PR-has-conflict-s/qaq-p/716529

[Also copying the content in case the link becomes unavailable] 

Hey,

So was in the same pinch, checked source code of the pull request html page and found out that there is indeed an endpoint for checking conflicts. 

And that is *Drumroll please*

https://bitbucket.org/api/1.0/repositories/<org_or_profile>/<repo_name>/pullrequests/<pull_request_id>/conflict-status

For example I got the pull request id from:

https://api.bitbucket.org/2.0/repositories/<org_or_profile>/<repo_name>/pullrequests/?fields=values.id

Then used that ID in the above conflict-check endpoint. 

Cheers! 

Hi Aritra,

thanks for trying to help in this case. I cannot open the link you posted even now, but it looks like the conent is for Bitbucket Cloud? The question was for Bitbucket Server and this resource doesn't exist for Bitbucket Server.

We now use a Git merge driver to detect conflicts in pull requests.

Best regards,
Andreas Gondek

Oh, sorry man. There was one trailing space after the URL. Anyway, Yeah thought the api endpoints will be there with a little variation. 

Can you check the

/conflict-status

is there or not, using your format of the request url? The funny thing is in the bitbucket cloud also the v1 REST api /pullrequests endpoint is not there.. but /pullrequests/ID/conflict-status is there. 

Anyway, sorry if I couldn't help you out. It seemed that it was a feasible and more than likely probable solution

Cheers,

Aritra

I tested it:

 

{
    "message": "null for uri: ***/pull-requests/27/conflict-status",
    "status-code": 404
}

Bitbucket Cloud and Bitbucket Server don't share any code base, they are fully independent applications.

For this case the merge driver is the best solution, using the REST API was a totally wrong approach.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Aug 21, 2018 in Bitbucket

Branch Management with Bitbucket

As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...

1,325 views 8 11
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you