exit codes by error type

skarim · skarim · commit 260497643ae5 · 2026-03-24T00:38:04.000-04:00
diff --git a/README.md b/README.md
@@ -427,3 +427,16 @@ gh stack push
 ```
 
 Compared to the typical workflow, there's no need to name branches, run `git add`, or run `git commit` separately. Each `gh stack add -Am "..."` does it all.
+
+## Exit codes
+
+| Code | Meaning |
+|------|---------|
+| 0 | Success |
+| 1 | Generic error |
+| 2 | Not in a stack / stack not found |
+| 3 | Rebase conflict |
+| 4 | GitHub API failure |
+| 5 | Invalid arguments or flags |
+| 6 | Disambiguation required (branch belongs to multiple stacks) |
+| 7 | Rebase already in progress |
diff --git a/cmd/add.go b/cmd/add.go
@@ -46,12 +46,12 @@ func runAdd(cfg *config.Config, opts *addOptions, args []string) error {
 	// Validate flag combinations
 	if opts.stageAll && opts.stageTracked {
 		cfg.Errorf("flags -A and -u are mutually exclusive")
-		return ErrSilent
+		return ErrInvalidArgs
 	}
 
 	result, err := loadStack(cfg, "")
 	if err != nil {
-		return ErrSilent
+		return ErrNotInStack
 	}
 	gitDir := result.GitDir
 	sf := result.StackFile
@@ -69,7 +69,7 @@ func runAdd(cfg *config.Config, opts *addOptions, args []string) error {
 	// a new branch from it). Only block if we're in the middle of the stack.
 	if idx >= 0 && idx < len(s.Branches)-1 {
 		cfg.Errorf("can only add branches on top of the stack; run `%s` to switch to %q", cfg.ColorCyan("gh stack top"), s.Branches[len(s.Branches)-1].Branch)
-		return ErrSilent
+		return ErrInvalidArgs
 	}
 
 	// Check if the current branch is a stack branch with no unique commits
@@ -152,17 +152,17 @@ func runAdd(cfg *config.Config, opts *addOptions, args []string) error {
 
 	if branchName == "" {
 		cfg.Errorf("branch name cannot be empty")
-		return ErrSilent
+		return ErrInvalidArgs
 	}
 
 	if err := sf.ValidateNoDuplicateBranch(branchName); err != nil {
 		cfg.Errorf("branch %q already exists in the stack", branchName)
-		return ErrSilent
+		return ErrInvalidArgs
 	}
 
 	if git.BranchExists(branchName) {
 		cfg.Errorf("branch %q already exists", branchName)
-		return ErrSilent
+		return ErrInvalidArgs
 	}
 
 	// Stage changes before creating the branch so we can fail early if
diff --git a/cmd/checkout.go b/cmd/checkout.go
@@ -53,13 +53,13 @@ func runCheckout(cfg *config.Config, opts *checkoutOptions) error {
 	gitDir, err := git.GitDir()
 	if err != nil {
 		cfg.Errorf("not a git repository")
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	sf, err := stack.Load(gitDir)
 	if err != nil {
 		cfg.Errorf("failed to load stack state: %s", err)
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	var s *stack.Stack
@@ -85,7 +85,7 @@ func runCheckout(cfg *config.Config, opts *checkoutOptions) error {
 		s, br, err = resolvePR(sf, opts.target)
 		if err != nil {
 			cfg.Errorf("%s", err)
-			return ErrSilent
+			return ErrNotInStack
 		}
 		targetBranch = br.Branch
 	}
diff --git a/cmd/init.go b/cmd/init.go
@@ -52,7 +52,7 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 	gitDir, err := git.GitDir()
 	if err != nil {
 		cfg.Errorf("not a git repository")
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	// Determine trunk branch
@@ -67,15 +67,15 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 		trunk, err = git.DefaultBranch()
 		if err != nil {
 			cfg.Errorf("unable to determine default branch\nUse -b to specify the trunk branch")
-			return ErrSilent
+			return ErrNotInStack
 		}
 	}
 
 	// Load existing stack file
 	sf, err := stack.Load(gitDir)
 	if err != nil {
 		cfg.Errorf("failed to load stack state: %s", err)
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	// Set repository context
@@ -93,7 +93,7 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 		for _, s := range sf.FindAllStacksForBranch(currentBranch) {
 			if s.IndexOf(currentBranch) >= 0 {
 				cfg.Errorf("current branch %q is already part of a stack", currentBranch)
-				return ErrSilent
+				return ErrInvalidArgs
 			}
 		}
 	}
@@ -104,16 +104,16 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 		// Adopt mode: validate all specified branches exist
 		if len(opts.branches) == 0 {
 			cfg.Errorf("--adopt requires at least one branch name")
-			return ErrSilent
+			return ErrInvalidArgs
 		}
 		for _, b := range opts.branches {
 			if !git.BranchExists(b) {
 				cfg.Errorf("branch %q does not exist", b)
-				return ErrSilent
+				return ErrInvalidArgs
 			}
 			if err := sf.ValidateNoDuplicateBranch(b); err != nil {
 				cfg.Errorf("branch %q already exists in a stack", b)
-				return ErrSilent
+				return ErrInvalidArgs
 			}
 		}
 		branches = opts.branches
@@ -132,7 +132,7 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 						state = "merged"
 					}
 					cfg.Errorf("branch %q already has a %s PR (#%d: %s)", b, state, pr.Number, pr.URL)
-					return ErrSilent
+					return ErrInvalidArgs
 				}
 			}
 		}
@@ -141,7 +141,7 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 		for _, b := range opts.branches {
 			if err := sf.ValidateNoDuplicateBranch(b); err != nil {
 				cfg.Errorf("branch %q already exists in a stack", b)
-				return ErrSilent
+				return ErrInvalidArgs
 			}
 			if !git.BranchExists(b) {
 				if err := git.CreateBranch(b, trunk); err != nil {
@@ -155,7 +155,7 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 		// Interactive mode
 		if !cfg.IsInteractive() {
 			cfg.Errorf("interactive input required; provide branch names or use --adopt")
-			return ErrSilent
+			return ErrInvalidArgs
 		}
 		p := prompter.New(cfg.In, cfg.Out, cfg.Err)
 
@@ -191,7 +191,7 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 			if useCurrentBranch {
 				if err := sf.ValidateNoDuplicateBranch(currentBranch); err != nil {
 					cfg.Errorf("branch %q already exists in the stack", currentBranch)
-					return ErrSilent
+					return ErrInvalidArgs
 				}
 				branches = []string{currentBranch}
 			}
@@ -218,15 +218,15 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 				branchName = branch.NextNumberedName(opts.prefix, nil)
 			} else if branchName == "" {
 				cfg.Errorf("branch name cannot be empty")
-				return ErrSilent
+				return ErrInvalidArgs
 			} else if opts.prefix != "" {
 				// Prepend prefix to the user-provided name
 				branchName = opts.prefix + "/" + branchName
 			}
 
 			if err := sf.ValidateNoDuplicateBranch(branchName); err != nil {
 				cfg.Errorf("branch %q already exists in a stack", branchName)
-				return ErrSilent
+				return ErrInvalidArgs
 			}
 			if !git.BranchExists(branchName) {
 				if err := git.CreateBranch(branchName, trunk); err != nil {
@@ -242,7 +242,7 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 	if opts.prefix != "" {
 		if err := git.ValidateRefName(opts.prefix); err != nil {
 			cfg.Errorf("invalid prefix %q: must be a valid git ref component", opts.prefix)
-			return ErrSilent
+			return ErrInvalidArgs
 		}
 	}
 
diff --git a/cmd/merge.go b/cmd/merge.go
@@ -35,7 +35,7 @@ func runMerge(cfg *config.Config, target string) error {
 	// Standard stack loading and validation.
 	result, err := loadStack(cfg, "")
 	if err != nil {
-		return ErrSilent
+		return ErrNotInStack
 	}
 	s := result.Stack
 	currentBranch := result.CurrentBranch
@@ -52,7 +52,7 @@ func runMerge(cfg *config.Config, target string) error {
 		_, br, err = resolvePR(result.StackFile, target)
 		if err != nil {
 			cfg.Errorf("%s", err)
-			return ErrSilent
+			return ErrNotInStack
 		}
 	} else {
 		idx := s.IndexOf(currentBranch)
@@ -62,7 +62,7 @@ func runMerge(cfg *config.Config, target string) error {
 				return nil
 			}
 			cfg.Errorf("current branch %q is not a stack branch (it may be the trunk)", currentBranch)
-			return ErrSilent
+			return ErrNotInStack
 		}
 		br = &s.Branches[idx]
 	}
diff --git a/cmd/merge_test.go b/cmd/merge_test.go
@@ -145,7 +145,7 @@ func TestMerge_OnTrunk(t *testing.T) {
 	errOut, _ := io.ReadAll(errR)
 	output := string(errOut)
 
-	assert.ErrorIs(t, err, ErrSilent)
+	assert.ErrorIs(t, err, ErrNotInStack)
 	assert.Contains(t, output, "not a stack branch")
 }
 
diff --git a/cmd/navigate.go b/cmd/navigate.go
@@ -61,7 +61,7 @@ func BottomCmd(cfg *config.Config) *cobra.Command {
 func runNavigate(cfg *config.Config, delta int) error {
 	result, err := loadStack(cfg, "")
 	if err != nil {
-		return ErrSilent
+		return ErrNotInStack
 	}
 	s := result.Stack
 	currentBranch := result.CurrentBranch
@@ -175,14 +175,14 @@ func runNavigate(cfg *config.Config, delta int) error {
 func runNavigateToEnd(cfg *config.Config, top bool) error {
 	result, err := loadStack(cfg, "")
 	if err != nil {
-		return ErrSilent
+		return ErrNotInStack
 	}
 	s := result.Stack
 	currentBranch := result.CurrentBranch
 
 	if len(s.Branches) == 0 {
 		cfg.Errorf("stack has no branches")
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	var targetIdx int
diff --git a/cmd/push.go b/cmd/push.go
@@ -40,38 +40,38 @@ func runPush(cfg *config.Config, opts *pushOptions) error {
 	gitDir, err := git.GitDir()
 	if err != nil {
 		cfg.Errorf("not a git repository")
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	sf, err := stack.Load(gitDir)
 	if err != nil {
 		cfg.Errorf("failed to load stack state: %s", err)
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	currentBranch, err := git.CurrentBranch()
 	if err != nil {
 		cfg.Errorf("failed to get current branch: %s", err)
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	// Find the stack for the current branch without switching branches.
 	// Push should never change the user's checked-out branch.
 	stacks := sf.FindAllStacksForBranch(currentBranch)
 	if len(stacks) == 0 {
 		cfg.Errorf("current branch %q is not part of a stack", currentBranch)
-		return ErrSilent
+		return ErrNotInStack
 	}
 	if len(stacks) > 1 {
 		cfg.Errorf("branch %q belongs to multiple stacks; checkout a non-trunk branch first", currentBranch)
-		return ErrSilent
+		return ErrDisambiguate
 	}
 	s := stacks[0]
 
 	client, err := cfg.GitHubClient()
 	if err != nil {
 		cfg.Errorf("failed to create GitHub client: %s", err)
-		return ErrSilent
+		return ErrAPIFailure
 	}
 
 	// Push all active branches atomically
diff --git a/cmd/rebase.go b/cmd/rebase.go
@@ -69,7 +69,7 @@ func runRebase(cfg *config.Config, opts *rebaseOptions) error {
 	gitDir, err := git.GitDir()
 	if err != nil {
 		cfg.Errorf("not a git repository")
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	if opts.cont {
@@ -82,7 +82,7 @@ func runRebase(cfg *config.Config, opts *rebaseOptions) error {
 
 	result, err := loadStack(cfg, opts.branch)
 	if err != nil {
-		return ErrSilent
+		return ErrNotInStack
 	}
 	sf := result.StackFile
 	s := result.Stack
@@ -242,7 +242,7 @@ func runRebase(cfg *config.Config, opts *rebaseOptions) error {
 					br.Branch, cfg.ColorCyan("gh stack rebase --continue"))
 				cfg.Printf("Or abort this operation with `%s`",
 					cfg.ColorCyan("gh stack rebase --abort"))
-				return fmt.Errorf("rebase conflict on %s", br.Branch)
+				return ErrConflict
 			}
 
 			cfg.Successf("Rebased %s onto %s (squash-merge detected)", br.Branch, newBase)
@@ -290,7 +290,7 @@ func runRebase(cfg *config.Config, opts *rebaseOptions) error {
 					br.Branch, cfg.ColorCyan("gh stack rebase --continue"))
 				cfg.Printf("Or abort this operation with `%s`",
 					cfg.ColorCyan("gh stack rebase --abort"))
-				return fmt.Errorf("rebase conflict on %s", br.Branch)
+				return ErrConflict
 			}
 
 			cfg.Successf("Rebased %s onto %s", br.Branch, base)
@@ -338,7 +338,7 @@ func continueRebase(cfg *config.Config, gitDir string) error {
 	sf, err := stack.Load(gitDir)
 	if err != nil {
 		cfg.Errorf("failed to load stack state: %s", err)
-		return ErrSilent
+		return ErrNotInStack
 	}
 
 	// Use the saved original branch to find the stack, since git may be in
@@ -440,7 +440,7 @@ func continueRebase(cfg *config.Config, gitDir string) error {
 					branchName, cfg.ColorCyan("gh stack rebase --continue"))
 				cfg.Printf("Or abort this operation with `%s`",
 					cfg.ColorCyan("gh stack rebase --abort"))
-				return fmt.Errorf("rebase conflict on %s", branchName)
+				return ErrConflict
 			}
 
 			cfg.Successf("Rebased %s onto %s (squash-merge detected)", branchName, newBase)
@@ -480,7 +480,7 @@ func continueRebase(cfg *config.Config, gitDir string) error {
 					branchName, cfg.ColorCyan("gh stack rebase --continue"))
 				cfg.Printf("Or abort this operation with `%s`",
 					cfg.ColorCyan("gh stack rebase --abort"))
-				return fmt.Errorf("rebase conflict on %s", branchName)
+				return ErrConflict
 			}
 
 			cfg.Successf("Rebased %s onto %s", branchName, base)
diff --git a/cmd/rebase_test.go b/cmd/rebase_test.go
@@ -250,7 +250,7 @@ func TestRebase_ConflictSavesState(t *testing.T) {
 	output := string(errOut)
 
 	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "rebase conflict on b2")
+	assert.ErrorIs(t, err, ErrConflict)
 	assert.Contains(t, output, "--continue")
 
 	// Verify state file was saved
diff --git a/cmd/root.go b/cmd/root.go
@@ -54,9 +54,11 @@ func RootCmd() *cobra.Command {
 func Execute() {
 	cmd := RootCmd()
 	if err := cmd.Execute(); err != nil {
-		if !errors.Is(err, ErrSilent) {
-			fmt.Fprintln(cmd.ErrOrStderr(), err)
+		var exitErr *ExitError
+		if errors.As(err, &exitErr) {
+			os.Exit(exitErr.Code)
 		}
+		fmt.Fprintln(cmd.ErrOrStderr(), err)
 		os.Exit(1)
 	}
 }
diff --git a/cmd/sync.go b/cmd/sync.go
diff --git a/cmd/unstack.go b/cmd/unstack.go
diff --git a/cmd/utils.go b/cmd/utils.go
diff --git a/cmd/view.go b/cmd/view.go

Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,13 @@ func runCheckout(cfg config.Config, opts checkoutOptions) error {`
`53`	`53`	`gitDir, err := git.GitDir()`
`54`	`54`	`if err != nil {`
`55`	`55`	`cfg.Errorf("not a git repository")`
`56`		`- return ErrSilent`
	`56`	`+ return ErrNotInStack`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`sf, err := stack.Load(gitDir)`
`60`	`60`	`if err != nil {`
`61`	`61`	`cfg.Errorf("failed to load stack state: %s", err)`
`62`		`- return ErrSilent`
	`62`	`+ return ErrNotInStack`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`var s *stack.Stack`
`@@ -85,7 +85,7 @@ func runCheckout(cfg config.Config, opts checkoutOptions) error {`
`85`	`85`	`s, br, err = resolvePR(sf, opts.target)`
`86`	`86`	`if err != nil {`
`87`	`87`	`cfg.Errorf("%s", err)`
`88`		`- return ErrSilent`
	`88`	`+ return ErrNotInStack`
`89`	`89`	`}`
`90`	`90`	`targetBranch = br.Branch`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func runInit(cfg config.Config, opts initOptions) error {`
`52`	`52`	`gitDir, err := git.GitDir()`
`53`	`53`	`if err != nil {`
`54`	`54`	`cfg.Errorf("not a git repository")`
`55`		`- return ErrSilent`
	`55`	`+ return ErrNotInStack`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`// Determine trunk branch`
`@@ -67,15 +67,15 @@ func runInit(cfg config.Config, opts initOptions) error {`
`67`	`67`	`trunk, err = git.DefaultBranch()`
`68`	`68`	`if err != nil {`
`69`	`69`	`cfg.Errorf("unable to determine default branch\nUse -b to specify the trunk branch")`
`70`		`- return ErrSilent`
	`70`	`+ return ErrNotInStack`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`// Load existing stack file`
`75`	`75`	`sf, err := stack.Load(gitDir)`
`76`	`76`	`if err != nil {`
`77`	`77`	`cfg.Errorf("failed to load stack state: %s", err)`
`78`		`- return ErrSilent`
	`78`	`+ return ErrNotInStack`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`// Set repository context`
`@@ -93,7 +93,7 @@ func runInit(cfg config.Config, opts initOptions) error {`
`93`	`93`	`for _, s := range sf.FindAllStacksForBranch(currentBranch) {`
`94`	`94`	`if s.IndexOf(currentBranch) >= 0 {`
`95`	`95`	`cfg.Errorf("current branch %q is already part of a stack", currentBranch)`
`96`		`- return ErrSilent`
	`96`	`+ return ErrInvalidArgs`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
`@@ -104,16 +104,16 @@ func runInit(cfg config.Config, opts initOptions) error {`
`104`	`104`	`// Adopt mode: validate all specified branches exist`
`105`	`105`	`if len(opts.branches) == 0 {`
`106`	`106`	`cfg.Errorf("--adopt requires at least one branch name")`
`107`		`- return ErrSilent`
	`107`	`+ return ErrInvalidArgs`
`108`	`108`	`}`
`109`	`109`	`for _, b := range opts.branches {`
`110`	`110`	`if !git.BranchExists(b) {`
`111`	`111`	`cfg.Errorf("branch %q does not exist", b)`
`112`		`- return ErrSilent`
	`112`	`+ return ErrInvalidArgs`
`113`	`113`	`}`
`114`	`114`	`if err := sf.ValidateNoDuplicateBranch(b); err != nil {`
`115`	`115`	`cfg.Errorf("branch %q already exists in a stack", b)`
`116`		`- return ErrSilent`
	`116`	`+ return ErrInvalidArgs`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`branches = opts.branches`
`@@ -132,7 +132,7 @@ func runInit(cfg config.Config, opts initOptions) error {`
`132`	`132`	`state = "merged"`
`133`	`133`	`}`
`134`	`134`	`cfg.Errorf("branch %q already has a %s PR (#%d: %s)", b, state, pr.Number, pr.URL)`
`135`		`- return ErrSilent`
	`135`	`+ return ErrInvalidArgs`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`}`
`@@ -141,7 +141,7 @@ func runInit(cfg config.Config, opts initOptions) error {`
`141`	`141`	`for _, b := range opts.branches {`
`142`	`142`	`if err := sf.ValidateNoDuplicateBranch(b); err != nil {`
`143`	`143`	`cfg.Errorf("branch %q already exists in a stack", b)`
`144`		`- return ErrSilent`
	`144`	`+ return ErrInvalidArgs`
`145`	`145`	`}`
`146`	`146`	`if !git.BranchExists(b) {`
`147`	`147`	`if err := git.CreateBranch(b, trunk); err != nil {`
`@@ -155,7 +155,7 @@ func runInit(cfg config.Config, opts initOptions) error {`
`155`	`155`	`// Interactive mode`
`156`	`156`	`if !cfg.IsInteractive() {`
`157`	`157`	`cfg.Errorf("interactive input required; provide branch names or use --adopt")`
`158`		`- return ErrSilent`
	`158`	`+ return ErrInvalidArgs`
`159`	`159`	`}`
`160`	`160`	`p := prompter.New(cfg.In, cfg.Out, cfg.Err)`
`161`	`161`
`@@ -191,7 +191,7 @@ func runInit(cfg config.Config, opts initOptions) error {`
`191`	`191`	`if useCurrentBranch {`
`192`	`192`	`if err := sf.ValidateNoDuplicateBranch(currentBranch); err != nil {`
`193`	`193`	`cfg.Errorf("branch %q already exists in the stack", currentBranch)`
`194`		`- return ErrSilent`
	`194`	`+ return ErrInvalidArgs`
`195`	`195`	`}`
`196`	`196`	`branches = []string{currentBranch}`
`197`	`197`	`}`
`@@ -218,15 +218,15 @@ func runInit(cfg config.Config, opts initOptions) error {`
`218`	`218`	`branchName = branch.NextNumberedName(opts.prefix, nil)`
`219`	`219`	`} else if branchName == "" {`
`220`	`220`	`cfg.Errorf("branch name cannot be empty")`
`221`		`- return ErrSilent`
	`221`	`+ return ErrInvalidArgs`
`222`	`222`	`} else if opts.prefix != "" {`
`223`	`223`	`// Prepend prefix to the user-provided name`
`224`	`224`	`branchName = opts.prefix + "/" + branchName`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`if err := sf.ValidateNoDuplicateBranch(branchName); err != nil {`
`228`	`228`	`cfg.Errorf("branch %q already exists in a stack", branchName)`
`229`		`- return ErrSilent`
	`229`	`+ return ErrInvalidArgs`
`230`	`230`	`}`
`231`	`231`	`if !git.BranchExists(branchName) {`
`232`	`232`	`if err := git.CreateBranch(branchName, trunk); err != nil {`
`@@ -242,7 +242,7 @@ func runInit(cfg config.Config, opts initOptions) error {`
`242`	`242`	`if opts.prefix != "" {`
`243`	`243`	`if err := git.ValidateRefName(opts.prefix); err != nil {`
`244`	`244`	`cfg.Errorf("invalid prefix %q: must be a valid git ref component", opts.prefix)`
`245`		`- return ErrSilent`
	`245`	`+ return ErrInvalidArgs`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func runMerge(cfg *config.Config, target string) error {`
`35`	`35`	`// Standard stack loading and validation.`
`36`	`36`	`result, err := loadStack(cfg, "")`
`37`	`37`	`if err != nil {`
`38`		`- return ErrSilent`
	`38`	`+ return ErrNotInStack`
`39`	`39`	`}`
`40`	`40`	`s := result.Stack`
`41`	`41`	`currentBranch := result.CurrentBranch`
`@@ -52,7 +52,7 @@ func runMerge(cfg *config.Config, target string) error {`
`52`	`52`	`_, br, err = resolvePR(result.StackFile, target)`
`53`	`53`	`if err != nil {`
`54`	`54`	`cfg.Errorf("%s", err)`
`55`		`- return ErrSilent`
	`55`	`+ return ErrNotInStack`
`56`	`56`	`}`
`57`	`57`	`} else {`
`58`	`58`	`idx := s.IndexOf(currentBranch)`
`@@ -62,7 +62,7 @@ func runMerge(cfg *config.Config, target string) error {`
`62`	`62`	`return nil`
`63`	`63`	`}`
`64`	`64`	`cfg.Errorf("current branch %q is not a stack branch (it may be the trunk)", currentBranch)`
`65`		`- return ErrSilent`
	`65`	`+ return ErrNotInStack`
`66`	`66`	`}`
`67`	`67`	`br = &s.Branches[idx]`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func TestMerge_OnTrunk(t *testing.T) {`
`145`	`145`	`errOut, _ := io.ReadAll(errR)`
`146`	`146`	`output := string(errOut)`
`147`	`147`
`148`		`- assert.ErrorIs(t, err, ErrSilent)`
	`148`	`+ assert.ErrorIs(t, err, ErrNotInStack)`
`149`	`149`	`assert.Contains(t, output, "not a stack branch")`
`150`	`150`	`}`
`151`	`151`