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.
Hi everyone, Are you Bitbucket DC customer? If so, we'd love to talk to you! Our team wants to dive deep to understand your long-term plans regarding Bitbucket DC and Atlassian Cloud. Do you plan...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events