feat(merge): resolve conflicts straight from the merge modal

The merge modal previews the selected target and offers 'Resolve conflicts' next to the stash retry when it predicts a conflict. A dirty target is autostashed. The resolver now aborts when closed natively (Alt+F4), so the merge and its autostash can never be left pending.
2026-10-02 18:53:34 +02:00
parent 8cf3a3a9d0
commit 214e53b714
6 changed files with 60 additions and 8 deletions
@@ -539,7 +539,8 @@
      "removeWorktree": "Worktree nach dem Mergen entfernen",
      "commitMessage": "Commit-Nachricht",
      "conflictedFiles": "Konfliktdateien:",
-      "stashAndMerge": "Änderungen stashen und mergen"
+      "stashAndMerge": "Änderungen stashen und mergen",
+      "resolveConflicts": "Konflikte lösen"
    },
    "diff": {
      "title": "DIFF",