From 7b05b011aa54e8c364f19999b3ccfdc55f5304b7 Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 2 Jun 2025 13:03:38 +0800 Subject: [PATCH] fix: `USE THEIRS` for `AU` conflict and `USE MINE` for `UA` conflict Signed-off-by: leo --- src/ViewModels/WorkingCopy.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index c17cea44..b501d8d2 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -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))