nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Need rest API endpoint to detect pull request merge conflicts before creating pull request

mohan yadav

Need rest API endpoint to detect pull request merge conflicts before creating pull request as below , so if we are going to take bitbucket UI automatically detect conflicts file before creation PR.

Please let me know which endpoint should I use to detect conflicts before creating PR.

Accepted answers

Patrik S

Hey @mohan yadav ,

thank you for reaching out to Community!

You should be able to "preview" a file conflict in a merge by using the diffstat endpoint and comparing the two branches of the pull request:

Compare two commit diff stats

In the path of the URL you can either provide the commits you wish to compare, or the branch names.

For the conflicted files, the output will show the field "status": "merge conflict."

You can find more details and examples in this other similar question here in Community:

Bitbucket Cloud - Check if a pull request has conflicts

Thank you, @mohan yadav !

Patrik S

All comments

Patrik S

Hey @mohan yadav ,

thank you for reaching out to Community!

You should be able to "preview" a file conflict in a merge by using the diffstat endpoint and comparing the two branches of the pull request:

Compare two commit diff stats

In the path of the URL you can either provide the commits you wish to compare, or the branch names.

For the conflicted files, the output will show the field "status": "merge conflict."

You can find more details and examples in this other similar question here in Community:

Bitbucket Cloud - Check if a pull request has conflicts

Thank you, @mohan yadav !

Patrik S

mohan yadav

both are not working which means it does not give me "status": "merge conflict."

https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-diffstat-spec-get

https://community.atlassian.com/forums/Bitbucket-questions/Bitbucket-Cloud-Check-if-a-pull-request-has-conflicts/qaq-p/2361098#M93815

mohan yadav

fyi https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commits/#api-repositories-workspace-repo-slug-file-conflicts-spec-get => this worked to get conflicts.

Thanks

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

cloud

bitbucket

bitbucket-cloud

rest