Highlight or sort files that should be resolved

[NikKovIos]

Problematic: Every time I experience a merge conflict while merging a large development branch into my feature branch, a large number of file changes appear in the left window. This makes it difficult to find all the files that require resolving, as their color (orange) resembles that of deleted files (red).

To address this issue, I propose the following suggestions:

• Change the color of merge conflict files.
• Sort merge conflict files into a separate category at the top of the window.
• Add a colored badge to indicate merge conflict files.
• Provide a hotkey to navigate to the next or previous merge conflict file.

[lucasderraugh]

I think the sorting suggestion is good. Definitely have experienced this myself trying to find all the files to resolve before continuing.