github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 05:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ux: always show Merge (Built-in) context menu entry for conflicts

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-01-27 18:24:56 +08:00
parent 89675c3dac
commit add3469844
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Views/WorkingCopy.axaml.cs
View File

@@ -338,21 +338,16 @@ namespace SourceGit.Views
if (change.ConflictReason is Models.ConflictReason.BothAdded or Models.ConflictReason.BothModified)
{
var isBinary = new Commands.IsBinary(repo.FullPath, "HEAD", change.Path).GetResultAsync().GetAwaiter().GetResult();
if (!isBinary)
var mergeBuiltin = new MenuItem();
mergeBuiltin.Header = App.Text("ChangeCM.Merge");
mergeBuiltin.Icon = App.CreateMenuIcon("Icons.Conflict");
mergeBuiltin.Click += async (_, e) =>
{
var mergeBuiltin = new MenuItem();
mergeBuiltin.Header = App.Text("ChangeCM.Merge");
mergeBuiltin.Icon = App.CreateMenuIcon("Icons.Conflict");
mergeBuiltin.Click += async (_, e) =>
{
var ctx = new ViewModels.MergeConflictEditor(repo, change.Path);
await ctx.LoadAsync();
await App.ShowDialog(ctx);
e.Handled = true;
};
menu.Items.Add(mergeBuiltin);
}
var ctx = new ViewModels.MergeConflictEditor(repo, change.Path);
await ctx.LoadAsync();
await App.ShowDialog(ctx);
e.Handled = true;
};
var mergeExternal = new MenuItem();
mergeExternal.Header = App.Text("ChangeCM.MergeExternal");
@@ -362,6 +357,8 @@ namespace SourceGit.Views
await vm.UseExternalMergeToolAsync(change);
e.Handled = true;
};
menu.Items.Add(mergeBuiltin);
menu.Items.Add(mergeExternal);
}