Conflict Icons

[tim-elmer]

Just a design suggestion, it's rather hard to determine which archive a conflict icon relates to, especially when the conflict style is "Inline". Some possible changes to help with this issue, in order of personal preference:

• Move the icon to the left, just between the collapse arrow for the archive and the archive's name.
• Add grid lines under archive names - using the same brush color as other grid lines in the UI should be sufficient.
• Highlight the row when mousing over an archive name, not just the text.