fix: GetCanStagedChanges should allow stage conflict that has been resolved manually (#1621)

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/ViewModels/WorkingCopy.cs

@@ -345,7 +345,7 @@ public void StashAll(bool autoStart)
 
         public async Task StageChangesAsync(List<Models.Change> changes, Models.Change next)
         {
-            var canStaged = GetCanStagedChanges(changes);
+            var canStaged = await GetCanStageChangesAsync(changes);
             var count = canStaged.Count;
             if (count == 0)
                 return;
@@ -645,16 +645,28 @@ public void CommitWithPush()
             return visible;
         }
 
-        private List<Models.Change> GetCanStagedChanges(List<Models.Change> changes)
+        private async Task<List<Models.Change>> GetCanStageChangesAsync(List<Models.Change> changes)
         {
             if (!HasUnsolvedConflicts)
                 return changes;
 
             var outs = new List<Models.Change>();
             foreach (var c in changes)
             {
-                if (!c.IsConflicted)
-                    outs.Add(c);
+                if (c.IsConflicted)
+                {
+                    var isResolved = c.ConflictReason switch
+                    {
+                        Models.ConflictReason.BothAdded or Models.ConflictReason.BothModified =>
+                            await new Commands.IsConflictResolved(_repo.FullPath, c).GetResultAsync(),
+                        _ => false,
+                    };
+
+                    if (!isResolved)
+                        continue;
+                }
+
+                outs.Add(c);
             }
 
             return outs;