From 1022a75722bf58fe578bdb8443b8335431b800ea Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Mon, 23 Feb 2026 19:20:37 -0800
Subject: [PATCH] Improve merge spinner messages and conflict resolution flow

---
 src/commands/helpers.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/commands/helpers.ts b/src/commands/helpers.ts
index a760c78..6f21917 100644
--- a/src/commands/helpers.ts
+++ b/src/commands/helpers.ts
@@ -52,20 +52,23 @@ export async function mergeAndClose(branch: string, opts?: { squash?: boolean })
   }
 
   const label = opts?.squash ? "Squash-merged" : "Merged"
+  const spin = spinner("Merging", branch)
   const conflicts = await git.merge(branch, root, opts?.squash ? { squash: true } : undefined)
 
   if (conflicts.length === 0) {
     if (opts?.squash) {
+      spin.text = "Starting container"
+      await vm.ensure((msg) => { spin.text = msg })
+      spin.text = "Generating commit message"
       await squashCommit(branch, root)
     }
-    console.log(`✔ ${label} ${branch} into current branch`)
+    spin.succeed(`${label} ${branch} into current branch`)
     await closeAction(branch)
     return
   }
 
   // Resolve conflicts with Claude
-  console.log(`◆ Merge conflicts in ${conflicts.length} file(s). Resolving with Claude...`)
-  const spin = spinner("Starting container", branch)
+  spin.text = `Resolving ${conflicts.length} conflict(s)`
 
   try {
     await vm.ensure((msg) => { spin.text = msg })