Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Update integration reason messages for clarity
Maximilian Roosee21e8c03f12
diff --git a/.claude/rules/cli-output-formatting.md b/.claude/rules/cli-output-formatting.mdindex 81d4a69aa..420ef572b 100644--- a/.claude/rules/cli-output-formatting.md+++ b/.claude/rules/cli-output-formatting.md@@ -89,9 +89,11 @@ behavior:```rust// GOOD - parallel structure with integration reason explaining branch deletion// Both wt merge and wt remove show integration reason when branch is deleted-"Removing feature worktree & branch in background (already in main)" // Branch is integrated (ancestor)-"Removing feature worktree & branch in background (files match main)" // Branch is integrated (squash/rebase)-"Removing feature worktree & branch in background (all changes in main)" // Branch is integrated (squash + main advanced)+"Removing feature worktree & branch in background (same commit as main)" // SameCommit+"Removing feature worktree & branch in background (ancestor of main)" // Ancestor (main moved past)+"Removing feature worktree & branch in background (no added changes)" // NoAddedChanges (empty 3-dot diff)+"Removing feature worktree & branch in background (tree matches main)" // TreesMatch (squash/rebase)+"Removing feature worktree & branch in background (all changes in main)" // MergeAddsNothing (squash + main advanced)"Removing feature worktree in background; retaining unmerged branch" // Unmerged (system keeps)"Removing feature worktree in background; retaining branch (--no-delete-branch)" // User flag (user keeps)```diff --git a/README.md b/README.mdindex 9ec1a427a..d1793873d 100644--- a/README.md+++ b/README.md@@ -100,9 +100,9 @@ Clean up when done:<!-- ⚠️ AUTO-GENERATED from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap — edit source to update -->-```bash+```console$ wt remove-🔄 Removing feature-api worktree & branch in background (already in main)+🔄 Removing feature-api worktree & branch in background (same commit as main)```<!-- END AUTO-GENERATED -->diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.mdindex 9e94a0233..0f548c208 100644--- a/docs/content/worktrunk.md+++ b/docs/content/worktrunk.md@@ -88,7 +88,7 @@ Clean up when done:{% terminal() %}<span class="prompt">$</span> <span class="cmd">wt remove</span>-🔄 <span class=c>Removing <b>feature-api</b> worktree & branch in background (already in main)</span>+🔄 <span class=c>Removing <b>feature-api</b> worktree & branch in background (same commit as main)</span>{% end %}<!-- END AUTO-GENERATED -->diff --git a/src/git/mod.rs b/src/git/mod.rsindex c312d8189..86145a20a 100644--- a/src/git/mod.rs+++ b/src/git/mod.rs@@ -93,12 +93,15 @@ pub enum IntegrationReason {impl IntegrationReason {/// Human-readable description for use in messages (e.g., `wt remove` output).+ ///+ /// Returns the phrase to appear inside parentheses. Some include `{target}`+ /// placeholder for the target branch name.pub fn description(&self) -> &'static str {match self {- Self::SameCommit => "already in",- Self::Ancestor => "already in",- Self::NoAddedChanges => "no file changes",- Self::TreesMatch => "files match",+ Self::SameCommit => "same commit as",+ Self::Ancestor => "ancestor of",+ Self::NoAddedChanges => "no added changes",+ Self::TreesMatch => "tree matches",Self::MergeAddsNothing => "all changes in",}}diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 1de4ac4ee..60fb72aa1 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -266,13 +266,10 @@ fn get_flag_note(let Some(target) = target_branch else {return String::new();};+ let desc = reason.description();match reason {- IntegrationReason::SameCommit | IntegrationReason::Ancestor => {- format!(" (already in {target})")- }- IntegrationReason::NoAddedChanges => " (no file changes)".to_string(),- IntegrationReason::TreesMatch => format!(" (files match {target})"),- IntegrationReason::MergeAddsNothing => format!(" (all changes in {target})"),+ IntegrationReason::NoAddedChanges => format!(" ({desc})"),+ _ => format!(" ({desc} {target})"),}}}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 ffd1e11ee..48dec3458 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 ffd1e11ee..48dec3458 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 9996d929d..c12d32da6 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 9996d929d..c12d32da6 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 f1de064e5..31a6e21e7 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as 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 2819bbf23..75f7ece37 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-api[22m worktree & branch in background (same commit as 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 61b563972..a32c4560d 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mto-remove[22m worktree & branch in background (same commit as main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snapindex 35a74acd2..85c11fd4e 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap@@ -35,4 +35,4 @@ Set-Location '[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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 55f4c0436..d6a2a4201 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap@@ -35,4 +35,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snapindex 62ce7f327..661de8ab0 100644--- a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap+++ b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap@@ -29,4 +29,4 @@ exit_code: 0Set-Location '[PATH]'----- stderr ------🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as main)[39m[39mdiff --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 2e117d771..5edfe9ea5 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@@ -39,4 +39,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 4f2d52a2f..6050496c8 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@@ -42,4 +42,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 03b91b445..be5ea308d 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@@ -38,4 +38,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 04cc468b2..fb003fee6 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@@ -39,4 +39,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 05d43b5a7..a51e0878e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 b7cdcd172..8be365ea6 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,4 +29,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mno-commits[22m worktree & branch in background (same commit as 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 8fd4cc8d3..cfdea5f1a 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@@ -39,4 +39,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mno-commits-dirty[22m worktree & branch in background (same commit as 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 52f94b4ea..18d430310 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 251657226..92f133818 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -36,4 +36,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 f6e699c6f..6140ddbb5 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@@ -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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 a84c4fd3a..ea2cec12b 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@@ -34,7 +34,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as main)[39m[39m🔄 [36mRunning project post-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[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 5bf8c8063..5528479fb 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@@ -34,7 +34,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as main)[39m[39m🔄 [36mRunning project 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🔄 [36mRunning project 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 189110ca8..5ed762692 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@@ -35,4 +35,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 62cf38f20..253ce626a 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@@ -34,6 +34,6 @@ 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as main)[39m[39m🔄 [36mRunning project 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.txtdiff --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 9e60a3910..e3a634467 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@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,6 +30,6 @@ 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as main)[39m[39m🔄 [36mRunning project 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.txtdiff --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 4aaea5531..814811e06 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@@ -43,4 +43,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 503ed3034..785dfc232 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@@ -40,4 +40,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snapindex 3bb2ba0c3..7e99e9505 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap@@ -34,4 +34,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 1b83da7ee..1897aa0f9 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@@ -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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 82259a8b9..8ee02e67b 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@@ -37,4 +37,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 306a4aa1f..35adf27e1 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@@ -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-from-develop[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-from-develop[22m worktree & branch in background (same commit as 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 2cd32f5eb..31b07dc41 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@@ -35,4 +35,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (same commit as 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 d1705d484..96b04c379 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@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,4 +30,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfast-forward-test[22m worktree & branch in background (same commit as 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 5e7d59821..7d374d69a 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@@ -35,4 +35,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (same commit as 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 172204103..7fd028277 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -45,4 +45,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 b19e90adb..93643b9ac 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@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -34,4 +39,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 2af2a09f6..4487cdad0 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@@ -33,4 +33,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 3d2a93a5b..ed1ca18a6 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@@ -37,4 +37,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 238a5c778..57221e7ca 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@@ -41,4 +41,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 52f94b4ea..18d430310 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 07ec38673..fb6195357 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@@ -35,4 +35,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 (already in staging)[39m[39m+🔄 [36m[36mRemoving [1mfeature-for-staging[22m worktree & branch in background (same commit as 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 05d43b5a7..a51e0878e 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@@ -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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 d01870604..85f724217 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 db6981e9d..21bad7003 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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature[22m worktree & branch in background (same commit as 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 fd5a90415..7a0a1377c 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -64,7 +64,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as main)[39m[39m🔄 [36mRunning project post-merge [1minstall[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[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 59321c438..8f4f9df9d 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@@ -59,4 +59,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as 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 850bcf418..383f30994 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -33,4 +33,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 (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfix-auth[22m worktree & branch in background (same commit as main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snapindex e6d8cd485..07293275d 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap@@ -7,6 +7,7 @@ info:- "--no-background"- feature-hookenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -28,4 +33,4 @@ exit_code: 0🔄 [36mRunning project pre-remove:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'About to remove worktree'[0m[2m[0mAbout to remove worktree-✅ [32mRemoved [1mfeature-hook[22m worktree & branch (already in main)[39m+✅ [32mRemoved [1mfeature-hook[22m worktree & branch (same commit as main)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snapindex 2d77e1f7c..9828b07c7 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap@@ -8,6 +8,7 @@ info:- "--no-verify"- feature-skipenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,10 +16,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -26,4 +31,4 @@ exit_code: 0----- stderr -----🔄 [36mRemoving worktree for [1mfeature-skip[22m...[39m-✅ [32mRemoved [1mfeature-skip[22m worktree & branch (already in main)[39m+✅ [32mRemoved [1mfeature-skip[22m worktree & branch (same commit as main)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snapindex 0cb86ae5e..275f92baa 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap@@ -7,6 +7,7 @@ info:- "--no-background"- feature-templatesenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -34,4 +39,4 @@ exit_code: 0🔄 [36mRunning project pre-remove [1mworktree_name[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Name: repo.feature-templates'[0m[2m[0mName: repo.feature-templates-✅ [32mRemoved [1mfeature-templates[22m worktree & branch (already in main)[39m+✅ [32mRemoved [1mfeature-templates[22m worktree & branch (same commit as main)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snapindex abe5cf1e3..1905ce912 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap@@ -6,6 +6,7 @@ info:- remove- feature-squashedenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,4 +29,4 @@ exit_code: 0----- stderr -----🟡 [33mNo worktree found for branch [1mfeature-squashed[22m[39m-✅ [32mRemoved branch [1mfeature-squashed[22m (files match main)[39m+✅ [32mRemoved branch [1mfeature-squashed[22m (tree matches main)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snapindex 0dd554f0a..1f0561a27 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap@@ -6,6 +6,7 @@ info:- remove- feature-mergedenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,4 +29,4 @@ exit_code: 0----- stderr -----🟡 [33mNo worktree found for branch [1mfeature-merged[22m[39m-✅ [32mRemoved branch [1mfeature-merged[22m (already in main)[39m+✅ [32mRemoved branch [1mfeature-merged[22m (same commit as main)[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 6fecd0865..ec4ca37d9 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@@ -6,6 +6,7 @@ info:- remove- feature-aenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,14 +14,18 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as 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 a35ce476d..ed1930955 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@@ -6,6 +6,7 @@ info:- remove- feature-benv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,14 +14,18 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as 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 8c3910393..0ecef2cde 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@@ -6,6 +6,7 @@ info:- remove- feature-currentenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,14 +14,18 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36m[36mRemoving [1mfeature-current[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-current[22m worktree & branch in background (same commit as main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex cf9239f41..1b3a1ba55 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap@@ -7,6 +7,7 @@ info:- "--no-background"- feature-fgenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,4 +30,4 @@ exit_code: 0----- stderr -----🔄 [36mRemoving worktree for [1mfeature-fg[22m...[39m-✅ [32mRemoved [1mfeature-fg[22m worktree & branch (already in main)[39m+✅ [32mRemoved [1mfeature-fg[22m worktree & branch (same commit as main)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 37c12d0e6..dc6faed85 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -5,6 +5,7 @@ info:args:- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,14 +13,18 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36m[36mRemoving [1mfeature-wt[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-wt[22m worktree & branch in background (same commit as 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 ff0feba52..442fce4db 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -6,6 +6,7 @@ info:- "--internal"- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,4 +29,4 @@ exit_code: 0cd '[REPO]'----- stderr ------🔄 [36m[36mRemoving [1mfeature-internal[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-internal[22m worktree & branch in background (same commit as 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 427ef7337..ae5f35038 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@@ -6,6 +6,7 @@ info:- remove- "--no-background"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,4 +29,4 @@ exit_code: 0----- stderr -----🔄 [36mRemoving current worktree...[39m-✅ [32mRemoved [1mfeature[22m worktree & branch; changed directory to [1m[REPO][22m (already in main)[39m+✅ [32mRemoved [1mfeature[22m worktree & branch; changed directory to [1m[REPO][22m (same commit as main)[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 80b7e50ef..49cbc0345 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@@ -6,6 +6,7 @@ info:- remove- feature2env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,14 +14,18 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36m[36mRemoving [1mfeature2[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature2[22m worktree & branch in background (same commit as 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 b6b80cb7d..9de21e00d 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@@ -8,6 +8,7 @@ info:- feature-b- feature-cenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,16 +16,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (already in main)[39m[39m-🔄 [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (already in main)[39m[39m-🔄 [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (same commit as main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as 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 b8b7faac8..8aa89aa3e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -8,6 +8,7 @@ info:- feature-b- feature-cenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,16 +16,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (already in main)[39m[39m-🔄 [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (already in main)[39m[39m-🔄 [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (already in main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as main)[39m[39m+🔄 [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (same commit as main)[39m[39m