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

fix: USE THEIRS for AU conflict and USE MINE for UA conflict
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-06-02 13:03:38 +08:00
parent f1052c3efc
commit 7b05b011aa
No known key found for this signature in database
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ViewModels/WorkingCopy.cs
View file

@ -389,7 +389,8 @@ namespace SourceGit.ViewModels
continue;
if (change.ConflictReason == Models.ConflictReason.BothDeleted ||
change.ConflictReason == Models.ConflictReason.DeletedByThem)
change.ConflictReason == Models.ConflictReason.DeletedByThem ||
change.ConflictReason == Models.ConflictReason.AddedByUs)
{
var fullpath = Path.Combine(_repo.FullPath, change.Path);
if (File.Exists(fullpath))
@ -432,7 +433,8 @@ namespace SourceGit.ViewModels
continue;
if (change.ConflictReason == Models.ConflictReason.BothDeleted ||
change.ConflictReason == Models.ConflictReason.DeletedByUs)
change.ConflictReason == Models.ConflictReason.DeletedByUs ||
change.ConflictReason == Models.ConflictReason.AddedByThem)
{
var fullpath = Path.Combine(_repo.FullPath, change.Path);
if (File.Exists(fullpath))