ux: show conflict description in change status icon

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Views/ChangeStatusIcon.cs

@@ -126,9 +126,16 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 }
 
                 if (isUnstaged)
-                    ToolTip.SetTip(this, TIPS[(int)c.WorkTree]);
+                {
+                    if (c.IsConflicted)
+                        ToolTip.SetTip(this, $"Conflict ({c.ConflictDesc})");
+                    else
+                        ToolTip.SetTip(this, TIPS[(int)c.WorkTree]);
+                }
                 else
+                {
                     ToolTip.SetTip(this, TIPS[(int)c.Index]);
+                }                    
 
                 InvalidateVisual();
             }