How to merge conflict pull requests using api

[Горбачев Артем]

Is there any possible way to merge pull requests with conflicts using Bitbucket api? Or maybe there is a way to resolve conflicts using api?

For example i'm using "git merge -s recursive -X ours" in linux terminal.

[Theodora Boudale]

Hi @Горбачев Артем and welcome to the community.

I believe that it is not possible to merge a PR with conflicts or resolve the conflicts with an API call, the same way you can do with a git merge command.

If you'd like, I can open a feature request in our issue tracker to provide an option to resolve a conflict with a specific strategy chosen by the user, for our development team to consider. Please feel free to let me know if you'd like me to do that.

Kind regards,
Theodora

[Alex.Cohn]

This is exactly what I need! Please add such feature!!

[Theodora Boudale]

Hi Alex,

Thank you for the feedback.

I created a feature request for the ability to merge a PR with conflicts using our API:

• https://jira.atlassian.com/browse/BCLOUD-23328

We already have two similar feature requests for the ability to do so via the UI:

• https://jira.atlassian.com/browse/BCLOUD-19568 (resolve conflicts with an inline editor)
• https://jira.atlassian.com/browse/BCLOUD-12935 (resolve conflicts with .gitattributes file)

Please make sure you add your vote to the feature requests you are interested in (by selecting the Vote for this issue link in the respective request), as the number of votes helps our product managers better understand the demand for new features. You are more than welcome to leave feedback, and you can also add yourself as a watcher (by selecting the Start watching this issue link) if you'd like to get notified via email on updates.

Implementation of new features is done as per our policy here and any updates will be posted in the feature requests.

Kind regards,
Theodora

[Alex.Cohn]

Thanks @Theodora Boudale, I believe that when https://jira.atlassian.com/browse/BCLOUD-12935 is ready, my team will be glad to adopt this feature.