Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
badges earned

Your Points Tracker
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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.

1 answer

0 votes

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,

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Bitbucket

Calling any interview participants for Bitbucket Data Center

Hi everyone,  We are looking to learn more about development teams’ workflows and pain points, especially around DevOps, integrations, administration, scale, security, and the related challeng...

493 views 5 4
Read article

Community Events

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

Events near you