Currently, we're told there are conflicts - thank you, that is very important and useful.

In GitHub, there is and has been for a while now, a feature to resolve conflicts in the PR's online page.

When will we see one of those in bitbucket?

These are the rough UI steps for such a solution:

• a [Resolve] button next to the 'CONFLICTED' label
• a link to the Bitbucket local dev instructions after the [Resolve] button
• when clicked, a modal dialog opens with the two-way diff and conflict identification and resolution suggestions
• a [OK] button that accepts the suggestions, commits them, and updates the file in the Bitbucket PR file-list
• a [Cancel] button to leave the conflict unresolved - closes the modal dialog (the user can click the local-dev instructions link mentioned above and follow them locally to resolve their merge conflict, if they want)

I understand there are nuances and it might fix the 80% orthodox situations and leave the 20% of cases to be resolved manually in a developer's local environment.  That's ok, because it's a start - and it can be incrementally improved.  This would remove the pressure to get a 100%-all-situations feature right and continue further delay to what would be a useful, welcome and powerful feature.