Is there any tool available to resolve merge conflicts directly in BitBucket?

[Sriram S]

Hi Team,

I can see we are not able to resolve the conflicts in UI. is there any tool available (Free/Paid) to solve this issue

[Aron Gombas _Midori_]

I don't know about any.

The harsh reality is that there are multiple web based editors for Bitbucket Server and Data Center, but Bitbucket Cloud has very basic support for apps in general. (You can't even make a paid Bitbucket Cloud app, so developers won't invest too much time into building these.)

[Theodora Boudale]

Hi @Sriram S,

I just wanted to add that we have several feature requests about this that you can vote for (by selecting the Vote for this issue link in each ticket) in order to express your interest:

• Resolving conflicts with .gitattributes file: https://jira.atlassian.com/browse/BCLOUD-12935
• Resolving conflicts by editing a file online: https://jira.atlassian.com/browse/BCLOUD-19568
• Resolving conflicts with --ours or --theirs flag: https://jira.atlassian.com/browse/BCLOUD-21899

You can also add yourself as a watcher to a certain feature request (by selecting the Start watching this issue link) if you'd like to get notified via email on updates.

Implementation of new features is done as per our policy here and any updates will be posted in the feature request.

Kind regards,
Theodora