fix: USE THEIRS for AU conflict and USE MINE for UA conflict

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

Author: love-linger

src/ViewModels/WorkingCopy.cs

@@ -389,7 +389,8 @@ public async void UseTheirs(List<Models.Change> changes)
                     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 @@ public async void UseMine(List<Models.Change> changes)
                     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))