dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-23 13:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-10 10:22:49 +08:00
parent bfc3f37e47
commit 855466686d
No known key found for this signature in database
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ViewModels/Conflict.cs
View file

@ -49,6 +49,11 @@
Theirs = merge.Source; Theirs = merge.Source;
Mine = repo.CurrentBranch; Mine = repo.CurrentBranch;
} }
else
{
Theirs = "Stash or Patch";
Mine = repo.CurrentBranch;
}
} }
public void UseTheirs() public void UseTheirs()

7
src/Views/WorkingCopy.axaml
View file

@ -239,6 +239,13 @@
<TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/> <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
</StackPanel> </StackPanel>
</DataTemplate> </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> </StackPanel.DataTemplates>
<Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/> <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>