Checkout a trunk instead of switching to the detached HEAD (#273)

Addressed #246
aviator-co · May 13, 2024 · 8cbf917 · 8cbf917
1 parent cd6a3f4
commit 8cbf917
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/internal/actions/sync_stack.go b/internal/actions/sync_stack.go
@@ -197,8 +197,10 @@ func SyncStack(ctx context.Context,
 				"  - deleting merged branch ", colors.UserInput(currentBranch),
 				"\n",
 			)
-			if _, err := repo.Git("switch", "--detach"); err != nil {
-				return errors.Errorf("cannot switch to detached HEAD: %v", err)
+
+			trunk, _ := meta.Trunk(tx, currentBranch)
+			if _, err := repo.CheckoutBranch(&git.CheckoutBranch{Name: trunk}); err != nil {
+				return errors.Errorf("cannot checkout to trunk %s: %v", trunk, err)
 			}
 			if _, err := repo.Git("branch", "-D", currentBranch); err != nil {
 				return errors.Errorf("cannot delete merged branch %q: %v", currentBranch, err)