Show conflict indicators in merge request Changes tab file list

Problem to Solve

When reviewing large merge requests with merge conflicts, it's difficult to quickly identify which files have conflicts without opening each file individually. Currently, the file list in the Changes tab doesn't provide any visual indication of which files contain conflicts.

Intended Users

• Code reviewers working with large merge requests
• Teams managing complex merges with multiple conflicting files
• Anyone needing to quickly assess the scope of conflicts in an MR

User Experience Goal

Reviewers should be able to see at a glance which files in the MR have merge conflicts, allowing them to:

• Quickly identify conflicted files scrolling through each file
• Prioritize conflict resolution
• Better understand the scope of conflicts before starting the review

Proposal

Add a visual indicator (such as an icon, badge, or color highlight) next to files in the Changes tab file list that have merge conflicts. This indicator should:

• Be clearly visible in the file browser/list
• Distinguish conflicted files from non-conflicted files

Benefits

• Improved efficiency: Reviewers can quickly identify conflicted files
• Better workflow: Easier to prioritize which files to review first
• Reduced friction: No need to open files individually to check for conflicts
• Enhanced UX: Provides important information upfront in the file list