Problem Definition

Bitbucket Cloud provides an API endpoint for merging a PR:

• https://developer.atlassian.com/cloud/bitbucket/rest/api-group-pullrequests/#api-repositories-workspace-repo-slug-pullrequests-pull-request-id-merge-post

If a PR contains conflicts, they need to be resolved locally in a clone of the repo and then pushed to Bitbucket Cloud for the merge to be possible.

This makes it more difficult to automate merging PRs with conflicts.

Suggested Solution

Users would like to be able to resolve merge conflicts with either --ours or --theirs strategy when merging a PR via API.

There is an existing feature request for the ability to do this in the UI: https://jira.atlassian.com/browse/BCLOUD-12935

This feature request is for the ability to do this with the API.

Workaround

The workaround is to clone the repo, resolve the conflicts locally, push them to Bitbucket and then merge:

https://support.atlassian.com/bitbucket-cloud/docs/resolve-merge-conflicts/