Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,359,836
Community Members
 
Community Events
168
Community Groups

How do I display conflicts in a pull request?

Edited
jmeyns I'm New Here Sep 08, 2022

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?

1 answer

1 accepted

0 votes
Answer accepted

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):

Kind regards,
Theodora

jmeyns I'm New Here Sep 11, 2022

Thank you for clearing things up for me.

 

All the best,

Jan Meyns

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
TAGS
Community showcase
Published in Bitbucket

Git push size limits are coming to Bitbucket Cloud starting April 4th, 2022

Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...

3,449 views 3 10
Read article

Atlassian Community Events