How do I display conflicts in a pull request?

[jmeyns]

I used to be able to look at merge conflicts when looking at a pull request on the web surface. Where did this feature go?

[Theodora Boudale · Accepted solution]

Hi @jmeyns,

We have changed the diff algorithm we use in pull requests to improve performance on complex diffs, you can check for more details here:

https://bitbucket.org/blog/improving-performance-on-complex-diffs

The new algorithm we use does not reflect changes made to the destination branch since the source branch was created from the destination branch, it will show only the changes introduced in the source branch. This is the reason why conflicts cannot be displayed on our website anymore.

We have a request to provide the previous preview-merge diff type on demand that you can vote for if you'd be interested in that (this diff would show conflicts as well):

• https://jira.atlassian.com/browse/BCLOUD-21964

Kind regards,
Theodora

[jmeyns]

Thank you for clearing things up for me.

All the best,

Jan Meyns