Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


why can't I resolve conflicts in the cloud?

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.
Nov 04, 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:

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,

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events