Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

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.

Get started Tell me more
Atlassian Community about banner
4,552,672
Community Members
 
Community Events
184
Community Groups

How do I display conflicts in a pull request?

Edited
jmeyns
jmeyns 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?

Answer
Watch
Like Be the first to like this
178 views

1 answer

1 accepted

0 votes
Answer accepted
Theodora Boudale
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Sep 09, 2022

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

View More Comments
jmeyns
jmeyns Sep 11, 2022

Thank you for clearing things up for me.

 

All the best,

Jan Meyns

Like
Reply

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
DEPLOYMENT TYPE
CLOUD
TAGS
AUG Leaders

Atlassian Community Events

See all events