feat(merge): Stash-Option fuer uncommittete Aenderungen im Ziel-Tree

Ein dirty Ziel-Arbeitsverzeichnis gibt jetzt den eigenen Status dirty_target zurueck statt blocked. Die UI bietet daraufhin einen Retry an, der per git merge --autostash stasht, merged und die Aenderungen danach wiederherstellt - opt-in pro Merge: - Approve & Merge: Bestaetigungsdialog - Merge-Modal: Button "Aenderungen stashen und mergen" - MCP (merge_task/review_task) wirft weiterhin, kein autostash dort
2026-09-11 11:43:28 +02:00
parent 8e2d37e63e
commit 251b70ce83
20 changed files with 164 additions and 43 deletions
@@ -708,7 +708,9 @@ public sealed class ExternalMcpService
            else
            {
                var r = await _merge.ApproveAndMergeAsync(taskId, targetBranch ?? "", leaveConflictsInTree, cancellationToken, progress, skipVerify);
-                if (r.Status == TaskMergeService.StatusBlocked)
+                // dirty_target is a refusal like blocked -- only the UI turns it into a stash
+                // retry; an MCP session must not read it as an approve that went through.
+                if (r.Status is TaskMergeService.StatusBlocked or TaskMergeService.StatusDirtyTarget)
                    throw new InvalidOperationException(r.ErrorMessage ?? "approve failed");
                mergeStatus = r.Status;
                mergeConflicts = r.ConflictFiles;