Merge claudedo/d86e63f916af4946bbc25098449669ac

2026-08-10 14:55:33 +02:00
parent 0bfb1f5657 29c79e8b8c
commit a1c90041c6
2 changed files with 59 additions and 1 deletions
@@ -315,7 +315,11 @@ public sealed class TaskMergeService
            if (stillConflicted.Count > 0)
                return new MergeResult(StatusConflict, stillConflicted, "conflicts not fully resolved");

-            await _git.AddAllAsync(list.WorkingDir, ct);
+            // Stage exactly the resolved conflict paths — never `git add -A`, which would sweep
+            // untracked/unrelated changes left by other sessions into this merge commit (the
+            // target working dir is shared).
+            foreach (var path in unresolved)
+                await _git.AddPathAsync(list.WorkingDir, path, ct);

            var remaining = await _git.ListConflictedFilesAsync(list.WorkingDir, ct);
            if (remaining.Count > 0)