Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

refactor(merge): Use shared `handle_remove_output`

Maximilian Roos80e9a32d1f60
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 2cd3e65fd..5ee4f91eb 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -9,7 +9,7 @@ use super::commit::{CommitOptions, commit_changes};
use super::context::CommandEnv;
use super::hooks::{HookFailureStrategy, HookPipeline};
use super::project_config::{collect_commands_for_hooks, load_project_config};
-use super::worktree::handle_push;
+use super::worktree::{RemoveResult, handle_push};
/// Context for collecting merge commands
struct MergeCommandCollector<'a> {
@@ -192,18 +192,7 @@ pub fn handle_merge(
// This prevents showing "Cleaning up worktree..." before failing
repo.ensure_clean_working_tree()?;
- // STEP 2: Emit CD directive and flush - shell executes cd immediately
- crate::output::change_directory(&primary_worktree_dir)?;
- crate::output::flush()?;
-
- // Show success message now that user has been cd'd to primary
- use worktrunk::styling::GREEN;
- crate::output::success(format!(
- "{GREEN}Returned to primary at {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}",
- primary_worktree_dir.display()
- ))?;
-
- // STEP 3: Switch to target branch in primary worktree (fails safely if there's an issue)
+ // STEP 2: Switch to target branch in primary worktree (fails safely if there's an issue)
let primary_repo = Repository::at(&primary_worktree_dir);
let new_branch = primary_repo.current_branch()?;
if new_branch.as_deref() != Some(&target_branch) {
@@ -215,18 +204,17 @@ pub fn handle_merge(
.git_context(&format!("Failed to switch to '{}'", target_branch))?;
}
- // STEP 4: Remove worktree and delete branch
+ // STEP 3: Remove worktree via shared remove output handler so final message matches wt remove
crate::output::progress(format!("{CYAN}Removing worktree & branch...{CYAN:#}"))?;
let worktree_root = repo.worktree_root()?;
- repo.remove_worktree(&worktree_root)
- .git_context("Failed to remove worktree")?;
- // Use -d (safe delete) instead of -D to protect against race conditions:
- // If someone commits to the branch between our push and this deletion,
- // -d will refuse to delete, preventing data loss.
- // See test: test_merge_race_condition_commit_after_push
- primary_repo
- .run_command(&["branch", "-d", &current_branch])
- .git_context(&format!("Failed to delete branch '{}'", current_branch))?;
+ let remove_result = RemoveResult::RemovedWorktree {
+ primary_path: primary_worktree_dir.clone(),
+ worktree_path: worktree_root,
+ changed_directory: true,
+ branch_name: current_branch.clone(),
+ no_delete_branch: false,
+ };
+ crate::output::handle_remove_output(&remove_result, Some(&current_branch), true)?;
} else {
// Print comprehensive summary (worktree preserved)
handle_merge_summary_output(None)?;
diff --git a/src/main.rs b/src/main.rs
index 13c6c23d6..25d8776be 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -245,7 +245,7 @@ fn main() {
if worktrees.is_empty() {
// No worktrees specified, remove current worktree
handle_remove(None, no_delete_branch)
- .and_then(|result| handle_remove_output(&result, None))
+ .and_then(|result| handle_remove_output(&result, None, false))
} else {
// When removing multiple worktrees, we need to handle the current worktree last
// to avoid deleting the directory we're currently in
@@ -278,13 +278,13 @@ fn main() {
// Progress messages shown by handle_remove_output for all cases
for worktree in others.iter() {
let result = handle_remove(Some(worktree.as_str()), no_delete_branch)?;
- handle_remove_output(&result, Some(worktree.as_str()))?;
+ handle_remove_output(&result, Some(worktree.as_str()), false)?;
}
// Remove current worktree last (if it was in the list)
if let Some(current_name) = current {
let result = handle_remove(Some(current_name.as_str()), no_delete_branch)?;
- handle_remove_output(&result, Some(current_name.as_str()))?;
+ handle_remove_output(&result, Some(current_name.as_str()), false)?;
}
Ok(())
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 7a66a4531..a601d9e85 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -121,7 +121,11 @@ pub fn execute_user_command(command: &str) -> Result<(), GitError> {
}
/// Handle output for a remove operation
-pub fn handle_remove_output(result: &RemoveResult, branch: Option<&str>) -> Result<(), GitError> {
+pub fn handle_remove_output(
+ result: &RemoveResult,
+ branch: Option<&str>,
+ strict_branch_deletion: bool,
+) -> Result<(), GitError> {
// Track whether branch was actually deleted (will be computed based on deletion attempt)
let branch_deleted = if let RemoveResult::RemovedWorktree {
primary_path,
@@ -155,9 +159,13 @@ pub fn handle_remove_output(result: &RemoveResult, branch: Option<&str>) -> Resu
match primary_repo.run_command(&["branch", "-d", branch_name]) {
Ok(_) => true,
Err(e) => {
- // If branch deletion fails, show a warning but don't error
- // This matches the user's request: "print a nice message, don't raise some big error"
- use worktrunk::git::GitError;
+ if strict_branch_deletion {
+ return Err(GitError::CommandFailed(format!(
+ "Failed to delete branch '{branch_name}': {e}"
+ )));
+ }
+
+ // If branch deletion fails in non-strict mode, show a warning but don't error
use worktrunk::styling::{WARNING, WARNING_BOLD, format_with_gutter};
// Show the warning message with branch name
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.snap
index dfe863155..604983f0a 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
@@ -34,5 +34,5 @@ expression: output.normalized()
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [TMPDIR]/test-repo
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [TMPDIR]/test-repo
diff --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.snap
index 0e70fd973..3708bcd6c 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
@@ -34,5 +34,5 @@ expression: output.normalized()
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [TMPDIR]/test-repo
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [TMPDIR]/test-repo
diff --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.snap
index 985d2e41a..23caf51ac 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
@@ -25,5 +25,5 @@ expression: output.normalized()
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [TMPDIR]/test-repo
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [TMPDIR]/test-repo
diff --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.snap
index 12916cc45..33c51e4be 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
@@ -25,5 +25,5 @@ expression: output.normalized()
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [TMPDIR]/test-repo
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [TMPDIR]/test-repo
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index b2df0f84a..fdc0cc771 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differ
diff --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.snap
index 42c87a65c..828a01c01 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
@@ -12,13 +12,12 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp478UOT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbpcDI7/test-config.toml
---
success: true
exit_code: 0
@@ -39,7 +38,7 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
βœ… Merged to main (1 commit, 2 files, +2)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 4939b7dba..d930256ba 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
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDATglu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnsdP1O/test-config.toml
---
success: true
exit_code: 0
@@ -35,7 +34,7 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --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.snap
index 894583613..4694dca3e 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
@@ -12,13 +12,12 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp73v2xh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLVc45l/test-config.toml
---
success: true
exit_code: 0
@@ -37,7 +36,7 @@ exit_code: 0
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index d295bfde2..4147354c2 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
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXuqopt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpumaJpl/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 71827f8b1..f3bb3b40e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcrXapQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBbNoY5/test-config.toml
---
success: true
exit_code: 0
@@ -27,7 +26,7 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
index 970507f75..5463a3ff3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
@@ -12,17 +12,16 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk2nHOw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0DAZH9/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
βœ… Merged to main (no new commits, no rebase needed)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for no-commits, returned to primary at [REPO]
----- stderr -----
diff --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.snap
index 8f38647b7..114a2a128 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
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmCFnfg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp426xs3/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for no-commits-dirty, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index dc39d7019..1c833387f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -13,11 +13,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpycTWSC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp344tWe/test-config.toml
---
success: true
exit_code: 0
@@ -30,7 +29,7 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
βœ… Merged to main (2 commits, 2 files, +2)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index e57b4c138..2e6c81d61 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
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptVveAD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph5Mekf/test-config.toml
---
success: true
exit_code: 0
@@ -27,7 +26,7 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --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.snap
index 2157d738a..54e517df2 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
@@ -13,11 +13,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvGV2EG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZUtX6m/test-config.toml
---
success: true
exit_code: 0
@@ -28,8 +27,8 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
πŸ”„ Running post-merge:
  exit 1
🟑 Command failed: Command failed with exit code: exit status: 1
diff --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.snap
index c751a6934..df1c7b9c2 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
@@ -13,11 +13,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzML5sa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeKuVqu/test-config.toml
---
success: true
exit_code: 0
@@ -28,8 +27,8 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
πŸ”„ Running post-merge: notify:
  echo 'Merge to main complete' > notify.txt
πŸ”„ Running post-merge: deploy:
diff --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.snap
index aafb8737a..53c018f84 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
@@ -13,11 +13,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO0P4o6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOgfyYr/test-config.toml
---
success: true
exit_code: 0
@@ -28,8 +27,8 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
πŸ”„ Running post-merge:
  echo 'merged feature to main' > post-merge-ran.txt
diff --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.snap
index f03c4d491..87664327e 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKT43OK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWhRbqP/test-config.toml
---
success: true
exit_code: 0
@@ -35,8 +35,8 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
Pre-commit check passed
diff --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.snap
index 65c535d38..d29fa9e08 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
@@ -13,11 +13,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMipHus/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeSfyqZ/test-config.toml
---
success: true
exit_code: 0
@@ -34,8 +33,8 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----

diff --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.snap
index 7429ac155..3dbd2c600 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
@@ -13,11 +13,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphGvBFt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfBUAox/test-config.toml
---
success: true
exit_code: 0
@@ -30,8 +29,8 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----

diff --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.snap
index 77bd0216c..ec3238030 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
@@ -13,11 +13,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiMJY8k/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjSvuWj/test-config.toml
---
success: true
exit_code: 0
@@ -30,8 +29,8 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
Pre-commit check passed
diff --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.snap
index fe93f4672..96ae44bb8 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
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpueTCqQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8TCe60/test-config.toml
---
success: true
exit_code: 0
@@ -27,8 +26,8 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Switching to main...
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature-from-develop, returned to primary at [REPO]
----- stderr -----
diff --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.snap
index acc62fcfa..2c76a41e7 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
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqjkaaK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2Zehen/test-config.toml
---
success: false
exit_code: 1
@@ -29,7 +28,6 @@ exit_code: 1
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Switching to main...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index a5ecaf880..fb254ba96 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0ndIjW/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdTaIlL/test-config.toml
---
success: true
exit_code: 0
@@ -39,7 +38,7 @@ exit_code: 0
  file3.txt | 1 +
  3 files changed, 3 insertions(+)
βœ… Merged to main (1 commit, 3 files, +3)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 7cb680e83..5d21c1237 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
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTrm2T4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUG0jFh/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +31,7 @@ exit_code: 0
  - Revert to initial
βšͺ No changes after squashing 3 commits
βœ… Merged to main (no new commits, no rebase needed)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 5ab8c8cb1..03687985d 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
@@ -12,12 +12,11 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZrBUJr/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDNVxVF/test-config.toml
---
success: true
exit_code: 0
@@ -38,7 +37,7 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
βœ… Merged to main (1 commit, 2 files, +2)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index c1b99386b..1c5ef01b2 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
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp60fOuw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbGm9rr/test-config.toml
---
success: true
exit_code: 0
@@ -27,7 +26,7 @@ exit_code: 0
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 426e20cf4..9067a1934 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
@@ -12,14 +12,13 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"
WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"
WORKTRUNK_COMMIT_GENERATION__COMMAND: sh
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE4VJ3V/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcgBcIT/test-config.toml
---
success: true
exit_code: 0
@@ -39,7 +38,7 @@ exit_code: 0
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index ddb959c6f..dbc4ee60c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -11,11 +11,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTxGuJQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphLqVJ1/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +25,7 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --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.snap
index 738f72bfc..5af9f2e9c 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
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEmMcIl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnUJRO4/test-config.toml
---
success: true
exit_code: 0
@@ -29,7 +28,7 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to staging (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature-for-staging, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index dedcac9b1..7c98be1b9 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
@@ -17,7 +17,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptF5zZb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAYDALB/test-config.toml
---
success: true
exit_code: 0
@@ -41,7 +41,7 @@ exit_code: 0
  untracked2.txt | 1 +
  3 files changed, 3 insertions(+)
βœ… Merged to main (1 commit, 3 files, +3)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index bce98a6ba..e67b296bc 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -13,12 +13,11 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplWomIW/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmputZ22Q/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplWomIW/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmputZ22Q/test-config.toml
---
success: true
exit_code: 0
@@ -47,8 +46,8 @@ exit_code: 0
  jwt.rs | 1 +
  3 files changed, 3 insertions(+)
βœ… Merged to main (1 commit, 3 files, +3)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for feature-auth, returned to primary at [REPO]
πŸ”„ Running post-merge: install:
  cargo install --path .
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index e51731096..f56e3feb1 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -12,11 +12,10 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
- GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVDu4Aa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRLrXwu/test-config.toml
---
success: true
exit_code: 0
@@ -27,7 +26,7 @@ exit_code: 0
  auth.rs | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
+βœ… Removed worktree & branch for fix-auth, returned to primary at [REPO]
----- stderr -----