Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Improve `wt switch -` history and merge logic
Maximilian Roos16f79bc27cc8
diff --git a/README.md b/README.mdindex 4aedb14fe..02a643a6f 100644--- a/README.md+++ b/README.md@@ -103,7 +103,7 @@ Say we merged via CI, our changes are on main, and we're finished with the workt```console$ wt remove-π Removing feature-api worktree & branch in background (ancestor of main)+π Removing feature-api worktree & branch in background (no marginal contribution to main)```<!-- END AUTO-GENERATED -->@@ -311,7 +311,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finjwt.rs | 8 ++++++++3 files changed, 33 insertions(+)β Merged to main (1 commit, 3 files, +33)-π Removing feature-auth worktree & branch in background (ancestor of main)+π Removing feature-auth worktree & branch in background (no marginal contribution to main)π Running post-merge install:cargo install --path .Installing worktrunk v0.1.0@@ -798,10 +798,12 @@ branch `foo` has a different worktree at `repo.bar/`, an error is raised.### Branch deletion-By default, branches are deleted only when their content has been integrated:+By default, branches are deleted only when their content is already in the target branch:-- Traditional merge: branch is an ancestor of the target (git's `-d` behavior)-- Squash merge/rebase: branch's tree SHA matches target's tree SHA+- no changes beyond the common ancestor β `git diff --name-only target...branch` is empty:+ no files changed between the merge base of `target`/`branch` and the tip of `branch`.+- same content as target β `git rev-parse branch^{tree}` equals `git rev-parse target^{tree}`:+ both branches point at the same tracked-files snapshot (tree), even if the commits differ.This handles workflows where PRs are squash-merged or rebased, which don't preservecommit ancestry but do integrate the content. Use `-D` to delete unintegrateddiff --git a/src/cli.rs b/src/cli.rsindex dfd91c12a..027b0b0ec 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -901,10 +901,12 @@ branch `foo` has a different worktree at `repo.bar/`, an error is raised.### Branch deletion-By default, branches are deleted only when their content has been integrated:+By default, branches are deleted only when their content is already in the target branch:-- Traditional merge: branch is an ancestor of the target (git's `-d` behavior)-- Squash merge/rebase: branch's tree SHA matches target's tree SHA+- no changes beyond the common ancestor β `git diff --name-only target...branch` is empty:+ no files changed between the merge base of `target`/`branch` and the tip of `branch`.+- same content as target β `git rev-parse branch^{tree}` equals `git rev-parse target^{tree}`:+ both branches point at the same tracked-files snapshot (tree), even if the commits differ.This handles workflows where PRs are squash-merged or rebased, which don't preservecommit ancestry but do integrate the content. Use `-D` to delete unintegrateddiff --git a/src/git/repository/mod.rs b/src/git/repository/mod.rsindex 22e94aa88..b73fe731d 100644--- a/src/git/repository/mod.rs+++ b/src/git/repository/mod.rs@@ -585,6 +585,20 @@ impl Repository {self.run_command_check(&["merge-base", "--is-ancestor", base, head])}+ /// Check if a branch has any marginal contribution compared to a target.+ ///+ /// Uses three-dot diff (`target...branch`) which shows changes from the merge-base+ /// to the branch. Returns false (no marginal contribution) when:+ /// - Branch is an ancestor of target (merge-base = branch)+ /// - Branch merged target and resolved back to merge-base state+ /// - Branch's net changes are empty for any other reason+ pub fn has_marginal_contribution(&self, branch: &str, target: &str) -> anyhow::Result<bool> {+ // git diff --name-only target...branch shows files changed from merge-base to branch+ let range = format!("{target}...{branch}");+ let stdout = self.run_command(&["diff", "--name-only", &range])?;+ Ok(!stdout.trim().is_empty())+ }+/// Count commits between base and head.pub fn count_commits(&self, base: &str, head: &str) -> anyhow::Result<usize> {// Limit concurrent rev-list operations to reduce mmap thrash on commit-graphdiff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 507b54fb4..92597b9e9 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -48,8 +48,8 @@ fn format_switch_success_message(/// Why a branch is considered integrated into the target.#[derive(Debug, Clone, Copy, PartialEq, Eq)]enum IntegrationReason {- /// Branch is an ancestor of target (traditional merge)- Merged,+ /// Branch has no marginal contribution to target (ancestor, merged back to base, etc.)+ NoMarginalContribution,/// Branch's tree SHA matches target's tree SHA (squash merge/rebase)ContentsMatch,}@@ -57,7 +57,7 @@ enum IntegrationReason {/// Check if a branch's content has been integrated into the target.////// Returns the reason if the branch is safe to delete:-/// - `Merged`: The branch is an ancestor of the target (traditional merge)+/// - `NoMarginalContribution`: The branch has no marginal contribution to target (ancestor, merged back, etc.)/// - `ContentsMatch`: The branch's tree SHA matches the target's tree SHA (squash merge/rebase)////// Returns None if neither condition is met, or if an error occurs (e.g., invalid refs).@@ -68,9 +68,13 @@ fn get_integration_reason(branch_name: &str,target: &str,) -> Option<IntegrationReason> {- // Check traditional merge relationship- if repo.is_ancestor(branch_name, target).unwrap_or(false) {- return Some(IntegrationReason::Merged);+ // Check if branch has no marginal contribution to target (covers ancestors and merged-back-to-base)+ // On error, conservatively assume branch HAS marginal contribution (won't delete)+ if !repo+ .has_marginal_contribution(branch_name, target)+ .unwrap_or(true)+ {+ return Some(IntegrationReason::NoMarginalContribution);}// Check if tree content matches (handles squash merge/rebase)@@ -161,7 +165,9 @@ fn get_flag_note(} else if let Some(target) = target_branch {// Show integration reason when branch is deleted (both wt merge and wt remove)match deletion_result {- Some(Some(IntegrationReason::Merged)) => format!(" (ancestor of {target})"),+ Some(Some(IntegrationReason::NoMarginalContribution)) => {+ format!(" (no marginal contribution to {target})")+ }Some(Some(IntegrationReason::ContentsMatch)) => format!(" (contents match {target})"),Some(None) | None => String::new(),}diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snapindex bba6bd184..37755833f 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap@@ -27,4 +27,4 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snapindex bba6bd184..37755833f 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap@@ -27,4 +27,4 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 50ca600b5..df30a26a7 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap@@ -16,4 +16,4 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snapindex 50ca600b5..df30a26a7 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap@@ -16,4 +16,4 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snapindex b8ba96e80..3128c655c 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap@@ -32,4 +32,4 @@ All checks passed![107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snapindex a2b3ef609..f41391bb2 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36m[36mRemoving [1mfeature-api[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-api[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snapindex 3d2a05d59..7ae76881a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36m[36mRemoving [1mto-remove[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mto-remove[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex af54fb473..b507681d6 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap@@ -31,4 +31,4 @@ cd '[PATH]'[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snapindex 872e2631c..d0187fa62 100644--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap@@ -86,10 +86,12 @@ branch [2mfoo[0m has a different worktree at [2mrepo.bar/[0m, an error is ra### Branch deletion-By default, branches are deleted only when their content has been integrated:+By default, branches are deleted only when their content is already in the target branch:-- Traditional merge: branch is an ancestor of the target (git's [2m-d[0m behavior)-- Squash merge/rebase: branch's tree SHA matches target's tree SHA+- no changes beyond the common ancestor β [2mgit diff --name-only target...branch[0m is empty:+ no files changed between the merge base of [2mtarget[0m/[2mbranch[0m and the tip of [2mbranch[0m.+- same content as target β [2mgit rev-parse branch^{tree}[0m equals [2mgit rev-parse target^{tree}[0m:+ both branches point at the same tracked-files snapshot (tree), even if the commits differ.This handles workflows where PRs are squash-merged or rebased, which don't preservecommit ancestry but do integrate the content. Use [2m-D[0m to delete unintegrateddiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 03a3c942d..e02fd4688 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap@@ -35,4 +35,4 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex d000c84e9..b2bcf7bfe 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap@@ -38,4 +38,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex cb0e5c96f..635babeb9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap@@ -34,4 +34,4 @@ exit_code: 0[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex 11ceaa59e..7d91267a9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap@@ -35,4 +35,4 @@ exit_code: 0[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex fdf6b1ab7..1773f8b15 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -29,4 +29,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex 27b9686a3..c3c52e85e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -25,4 +25,4 @@ exit_code: 0----- stderr -----βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36m[36mRemoving [1mno-commits[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mno-commits[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex 6fdb9765d..6d837bdcd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap@@ -35,4 +35,4 @@ exit_code: 0[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mno-commits-dirty[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mno-commits-dirty[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 10efbcf60..c5d8823cd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -28,4 +28,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 1b4255a82..8e4a870cd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -32,4 +32,4 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1mmain[22m [90m(2 commits, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex a4cb7d716..5204a7e97 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap@@ -29,4 +29,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snapindex 22ddd76b6..1fb3f1863 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap@@ -30,7 +30,7 @@ exit_code: 1[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mπ [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mπ‘ [33mCommand failed: exit status: 1[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snapindex b576391c2..c9ce40985 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap@@ -30,7 +30,7 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mπ [36mRunning post-merge [1mnotify[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Merge to main complete'[0m[2m [0m[2m[36m>[0m[2m notify.txt[0m[0mπ [36mRunning post-merge [1mdeploy[22m:[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snapindex 988600bb1..5937703bf 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap@@ -31,4 +31,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snapindex 84a0e020d..42a46d3e9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap@@ -30,7 +30,7 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mπ [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'merged feature to main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snapindex 60f7f2949..25c6ab75f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mπ [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex bbcf18cf9..ff57371a0 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap@@ -39,4 +39,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snapindex 419f61b92..7a2c595ca 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap@@ -36,4 +36,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snapindex f7666ef86..f6e2d27e3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap@@ -32,4 +32,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snapindex 0b8d7dbfe..7ececdfd6 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap@@ -33,4 +33,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snapindex 0c19527fb..db7bc2e84 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap@@ -29,4 +29,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-from-develop[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-from-develop[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snapindex 919f46b32..25783b748 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap@@ -31,4 +31,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snapindex 5fb09acdb..6bcb9904a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap@@ -26,4 +26,4 @@ exit_code: 0----- stderr -----β [32mFast-forwarded to [1mmain[22m[39mβͺ Already up to date with [1mmain[22m (no new commits)-π [36m[36mRemoving [1mfast-forward-test[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfast-forward-test[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snapindex f3196bee4..87d7befcb 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap@@ -31,4 +31,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex aa59bd1fd..819162d4d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -41,4 +41,4 @@ exit_code: 0[107m [0m file3.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex b3843cc91..2d75aac6a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap@@ -35,4 +35,4 @@ exit_code: 0[107m [0m - Revert to initialβͺ No changes after squashing 3 commitsβͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex 9bf5690b3..213ae4317 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -40,4 +40,4 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex 2a598ee12..67827c87b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap@@ -29,4 +29,4 @@ exit_code: 0[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex 899d69eee..46da169af 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap@@ -33,4 +33,4 @@ exit_code: 0[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex aec367d16..6d662dd41 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap@@ -42,4 +42,4 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 10efbcf60..c5d8823cd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -28,4 +28,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snapindex 3c71e6f1a..f2b3eaf77 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap@@ -31,4 +31,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mstaging[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-for-staging[22m worktree & branch in background (ancestor of staging)[39m[39m+π [36m[36mRemoving [1mfeature-for-staging[22m worktree & branch in background (no marginal contribution to staging)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snapindex fdf6b1ab7..1773f8b15 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap@@ -29,4 +29,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex f58afb55e..ec671fca2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap@@ -29,4 +29,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex c9f7db256..0b5b85d6c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap@@ -45,4 +45,4 @@ exit_code: 0[107m [0m untracked2.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 307f20a91..b113c240a 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -61,7 +61,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin[107m [0m jwt.rs | 8 [32m++++++++[m[107m [0m 3 files changed, 33 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+33[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (no marginal contribution to main)[39m[39mπ [36mRunning post-merge [1minstall[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0m[0m Installing worktrunk v0.1.0diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snapindex 554ff63ad..e39aed6b6 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap@@ -56,4 +56,4 @@ All checks passed![107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 803906331..47ae3face 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -29,4 +29,4 @@ exit_code: 0[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+13[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfix-auth[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfix-auth[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snapindex 53fb4b346..e02b06328 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap@@ -24,4 +24,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snapindex e16f99f05..22fa0b91f 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap@@ -24,4 +24,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snapindex fe234b7f6..5fff6832f 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap@@ -24,4 +24,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-current[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-current[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex de378ddd7..687d9588e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap@@ -26,4 +26,4 @@ exit_code: 0----- stderr -----π [36m[36mRemoving worktree for [1mfeature-fg[22m...[39m[39m-β [32m[32mRemoved [1mfeature-fg[22m worktree & branch (ancestor of main)[39m[39m+β [32m[32mRemoved [1mfeature-fg[22m worktree & branch (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 281649e60..ce416843e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-wt[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-wt[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex a4c926a28..be0357ec1 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -25,4 +25,4 @@ exit_code: 0cd '[REPO]'----- stderr ------π [36m[36mRemoving [1mfeature-internal[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-internal[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snapindex 548aedb41..3049ce679 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snapindex dbd04ddc2..20fae822f 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap@@ -24,4 +24,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature2[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature2[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snapindex 60fe098fb..2f907764a 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap@@ -26,6 +26,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (ancestor of main)[39m[39m-π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (ancestor of main)[39m[39m-π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (no marginal contribution to main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex e59137c72..bfdda1ba6 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -26,6 +26,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (ancestor of main)[39m[39m-π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (ancestor of main)[39m[39m-π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (ancestor of main)[39m[39m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (no marginal contribution to main)[39m[39m