fix: using theirs or mine does not work if it is deleted by ours or theirs

Signed-off-by: leo <[email protected]>

Author: love-linger

src/ViewModels/WorkingCopy.cs

@@ -388,7 +388,8 @@ public async void UseTheirs(List<Models.Change> changes)
                 if (!change.IsConflicted)
                     continue;
 
-                if (change.WorkTree == Models.ChangeState.Deleted)
+                if (change.ConflictReason == Models.ConflictReason.BothDeleted ||
+                    change.ConflictReason == Models.ConflictReason.DeletedByThem)
                 {
                     var fullpath = Path.Combine(_repo.FullPath, change.Path);
                     if (File.Exists(fullpath))
@@ -430,7 +431,8 @@ public async void UseMine(List<Models.Change> changes)
                 if (!change.IsConflicted)
                     continue;
 
-                if (change.Index == Models.ChangeState.Deleted)
+                if (change.ConflictReason == Models.ConflictReason.BothDeleted ||
+                    change.ConflictReason == Models.ConflictReason.DeletedByUs)
                 {
                     var fullpath = Path.Combine(_repo.FullPath, change.Path);
                     if (File.Exists(fullpath))