Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

why can't I resolve conflicts in the cloud?

Leonardo Bravo
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
November 2, 2022

I am a reviewer and can see the committed and the conflict, if I approve would like to choose what version to take.

 

If the committer is not longer part of the organisation who can solve this? 

1 answer

1 vote
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
November 4, 2022

Hi Leonardo and welcome to the community.

Merge conflicts cannot be resolved on Bitbucket Cloud website at the moment. We have a feature request about this in our issue tracker that you can vote for and comment on to further express your interest: https://jira.atlassian.com/browse/BCLOUD-12935

Any user that has write access to the repo and permission to write the source branch can resolve conflicts locally and push the changes to Bitbucket. We have the following documentation on how to resolve conflicts locally:

If you have any questions, please feel free to reach out.

Kind regards,
Theodora

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
TAGS
AUG Leaders

Atlassian Community Events