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

enhance: show friendly name instead of --theirs or --mine while resolving conflicts

Browse source
This commit is contained in:
leo 2024-12-10 16:44:37 +08:00
parent c8cdda3477
commit feb7e96b2c
No known key found for this signature in database
5 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/ViewModels/WorkingCopy.cs
View file

@ -569,6 +569,22 @@ namespace SourceGit.ViewModels
e.Handled = true;
};
if (_inProgressContext is RebaseInProgress rebase)
{
useTheirs.Header = App.Text("FileCM.ResolveUsing", rebase.HeadName);
useMine.Header = App.Text("FileCM.ResolveUsing", rebase.StoppedAt.SHA.Substring(0, 10));
}
else if (_inProgressContext is CherryPickInProgress cherryPick)
{
useTheirs.Header = App.Text("FileCM.ResolveUsing", cherryPick.Head.SHA.Substring(0, 10));
useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name);
}
else if (_inProgressContext is MergeInProgress merge)
{
useTheirs.Header = App.Text("FileCM.ResolveUsing", merge.SourceName);
useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name);
}
menu.Items.Add(useTheirs);
menu.Items.Add(useMine);
menu.Items.Add(openMerger);
@ -892,6 +908,22 @@ namespace SourceGit.ViewModels
e.Handled = true;
};
if (_inProgressContext is RebaseInProgress rebase)
{
useTheirs.Header = App.Text("FileCM.ResolveUsing", rebase.HeadName);
useMine.Header = App.Text("FileCM.ResolveUsing", rebase.StoppedAt.SHA.Substring(0, 10));
}
else if (_inProgressContext is CherryPickInProgress cherryPick)
{
useTheirs.Header = App.Text("FileCM.ResolveUsing", cherryPick.Head.SHA.Substring(0, 10));
useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name);
}
else if (_inProgressContext is MergeInProgress merge)
{
useTheirs.Header = App.Text("FileCM.ResolveUsing", merge.SourceName);
useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name);
}
menu.Items.Add(useTheirs);
menu.Items.Add(useMine);
return menu;