commit 956626d63041ec76d3994bd3fda02448e49aab46
author Josh Bleecher Snyder <josharian@gmail.com> Thu May 15 21:24:07 2025 +0000
committer Josh Bleecher Snyder <josharian@gmail.com> Thu May 15 14:37:05 2025 -0700
tree 3723db8c989cbb1bc324aa2680bd60c2cce0b114
parent f163e9e785845bed2d7fba31ddf06a22a2e1e853

termui: add branch delete command

Co-Authored-By: sketch <hello@sketch.dev>
Change-ID: s114722c8790c2a41k

termui/termui.go

diff --git a/termui/termui.go b/termui/termui.go
index 6293824..d76d415 100644
--- a/termui/termui.go
+++ b/termui/termui.go
@@ -265,8 +265,9 @@
 				initialCommitRef := getShortSHA(ui.agent.SketchGitBase())
 				if len(branches) == 1 {
 					ui.AppendSystemMessage("\n🔄 Branch pushed during session: %s", branches[0])
-					ui.AppendSystemMessage("🍒 To add those changes to your branch: git cherry-pick %s..%s", initialCommitRef, branches[0])
-					ui.AppendSystemMessage("🔀                                   or git merge %s", branches[0])
+					ui.AppendSystemMessage("🍒 Cherry-pick those changes: git cherry-pick %s..%s", initialCommitRef, branches[0])
+					ui.AppendSystemMessage("🔀 Merge those changes:       git merge %s", branches[0])
+					ui.AppendSystemMessage("🗑️  Delete the branch:         git branch -D %s", branches[0])
 				} else {
 					ui.AppendSystemMessage("\n🔄 Branches pushed during session:")
 					for _, branch := range branches {
@@ -276,14 +277,15 @@
 					for _, branch := range branches {
 						ui.AppendSystemMessage("git cherry-pick %s..%s", initialCommitRef, branch)
 					}
-					ui.AppendSystemMessage("\n🍒 To add all those changes to your branch:")
-					for _, branch := range branches {
-						ui.AppendSystemMessage("git cherry-pick %s..%s", initialCommitRef, branch)
-					}
 					ui.AppendSystemMessage("\n🔀                              or:")
 					for _, branch := range branches {
 						ui.AppendSystemMessage("git merge %s", branch)
 					}
+
+					ui.AppendSystemMessage("\n🗑️  To delete branches:")
+					for _, branch := range branches {
+						ui.AppendSystemMessage("git branch -D %s", branch)
+					}
 				}
 			}
 			ui.mu.Unlock()