Add red border around file merge conflict alert
What does this MR do and why?
- Adds red border around merge conflict file on MR diff view
- Add red background to file header
Why?
- It's really difficult to distinguish the alert from removed lines
- (personal use case) When I have conflicts I always go right to the diff to find the file and see what's changed on
master. Depending on the amount of changes it can be tricky to actually find the conflicted file in the UI - Further enhancement: Change the text color of the file in the file tree to red & add an icon
Screenshots or screen recordings
| Before | After |
|---|---|
 |
 |
How to set up and validate locally
Go to an MR with merge conflicts
Links
Edited by Annabel Dunstone Gray