You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
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?
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.