Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

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


1 badge earned


Participate in fun challenges

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


Gift kudos to your peers

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


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!


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
Community Members
Community Events
Community Groups

How do I display conflicts in a pull request?


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

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,

Thank you for clearing things up for me.


All the best,

Jan Meyns

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events