From 855466686dab79b4936a669082ffde6ebb47acda Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 10:22:49 +0800
Subject: [PATCH] ux: show conflict sources when it comes from a stash or patch
 (#1067)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Conflict.cs  | 5 +++++
 src/Views/WorkingCopy.axaml | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/ViewModels/Conflict.cs b/src/ViewModels/Conflict.cs
index 153a8d4f..03c09e8a 100644
--- a/src/ViewModels/Conflict.cs
+++ b/src/ViewModels/Conflict.cs
@@ -49,6 +49,11 @@
                 Theirs = merge.Source;
                 Mine = repo.CurrentBranch;
             }
+            else
+            {
+                Theirs = "Stash or Patch";
+                Mine = repo.CurrentBranch;
+            }
         }
 
         public void UseTheirs()
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index e5728df2..926bce6e 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -239,6 +239,13 @@
                           <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
                         </StackPanel>
                       </DataTemplate>
+
+                      <DataTemplate DataType="x:String">
+                        <StackPanel Orientation="Horizontal">
+                          <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
+                          <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
+                        </StackPanel>
+                      </DataTemplate>
                     </StackPanel.DataTemplates>
                     
                     <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>