From 9fca82abaa621a196e8eadc94af0244e24f1b684 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Thu, 22 Oct 2026 13:28:43 -0700 Subject: [PATCH] =?UTF-8?q?Make=20=E2=8C=98S=20open=20discard=20confirmati?= =?UTF-8?q?on=20when=20there=20is=20nothing=20to=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mac/Sources/Byre/Switcher.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mac/Sources/Byre/Switcher.swift b/mac/Sources/Byre/Switcher.swift index 91167ae..3e3dcf0 100644 --- a/mac/Sources/Byre/Switcher.swift +++ b/mac/Sources/Byre/Switcher.swift @@ -36,7 +36,7 @@ func runGo(_ key: String, _ store: Store, _ overlays: Overlays) { break } Task { - if let task = store.findTask(taskId), task.state == .discardSuggested { + if let task = store.findTask(taskId), task.status == .active, task.state == .discardSuggested || (task.mergeFacts.unmergedCommits == 0 && task.mergeFacts.unmergedFiles == 0) { await confirmDiscard(task, store, overlays) return } @@ -80,7 +80,7 @@ private let shortcuts: [(String, [(String, String)])] = [ ("⌘T", "Show every project's active tasks"), ("⌘P", "Show the current project's dashboard"), ("⌘L", "Open the Lead tab and its composer, closing any view opened over a pane"), - ("⌘S", "Merge the right pane's task, or discard it when the agent suggests discarding"), + ("⌘S", "Merge the right pane's task, or discard it when the agent suggests discarding or there is nothing to merge"), ("⌘[ ⌘]", "Bring the previous or next server's window forward"), ("⌘/", "Show these shortcuts"), ("Esc", "Close the switcher, a dialog, or a view opened over a pane"),