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

fix: resolve conflict with deleted files does not work (#1009)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-02-21 10:26:14 +08:00
parent 9da2c787db
commit 2b4fc64c73
No known key found for this signature in database
3 changed files with 64 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Views/TextDiffView.axaml.cs
View file

@ -1796,7 +1796,7 @@ namespace SourceGit.Views
if (!selection.HasLeftChanges)
{
new Commands.Add(repo.FullPath, [change]).Exec();
new Commands.Add(repo.FullPath, [change.Path]).Exec();
}
else
{