ux: show conflict sources when it comes from a stash or patch (#1067)

love-linger · love-linger · commit 855466686dab · 2025-03-10T10:22:49.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/Conflict.cs b/src/ViewModels/Conflict.cs
@@ -49,6 +49,11 @@ public Conflict(Repository repo, WorkingCopy wc, Models.Change change)
                 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
@@ -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"/>

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,11 @@ public Conflict(Repository repo, WorkingCopy wc, Models.Change change)`
`49`	`49`	`Theirs = merge.Source;`
`50`	`50`	`Mine = repo.CurrentBranch;`
`51`	`51`	`}`
	`52`	`+ else`
	`53`	`+ {`
	`54`	`+ Theirs = "Stash or Patch";`
	`55`	`+ Mine = repo.CurrentBranch;`
	`56`	`+ }`
`52`	`57`	`}`
`53`	`58`
`54`	`59`	`public void UseTheirs()`