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

Add filter to PR to show only conflicted files

netmajor
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
Nov 13, 2023

I have Pull request with haundred of files. When I have conflict it is hard to find on witch files it occurs. It is posiible to add new filter to show only conflicted files ?


1 answer

0 votes
Patrik S
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Nov 14, 2023

Hello @netmajor and welcome to the Community!

You can make use of the File view in the right sidebar of the Pull Request to navigate the files containing a conflict, as in the following example : 

Screenshot 2023-11-14 at 4.25.19 PM.png

All conflicted files will be presented with a warning yellow icon after the file name. You can look for the files with conflicts in that list, and if you want to check a file more in detail you have the option to click on the respective file in the list and the page will automatically scroll to focus on the file selected.

Hope that helps! Let us know in case you have any questions.

Thank you, @netmajor !

Patrik S

netmajor
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
Nov 15, 2023

Hi , I am using BB 8.15 and i can not find options you are mention :/ it is available in newer version?

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
PERMISSIONS LEVEL
Site Admin
TAGS
AUG Leaders

Atlassian Community Events