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.
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
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.