Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
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

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,463,526
Community Members
 
Community Events
176
Community Groups

Why was highlighting of merge conflicts removed?

Edited

I created a new pull request. It has merge conflicts in one file, but I don't see the conflict anymore, it just shows me the conflicted file and code!

There was a pop up saying that highlighting of merge conflicts was removed.

This makes no sense to me. Is there a way to enable it again?

2 comments

Sometimes it takes up to 40 seconds for that info box to show up.

Is there any way to bring it back?

it was really nice feature, really not sure why it was remoed.

Comment

Log in or Sign up to comment
TAGS

Atlassian Community Events