Skip to content

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

Run pre-merge checks before auto-commit to fail early

Maximilian Roos037b7fa6bef1
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 9c67de23b..3870de298 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -43,12 +43,8 @@ pub fn handle_merge(
let config = WorktrunkConfig::load()
.map_err(|e| GitError::CommandFailed(format!("Failed to load config: {}", e)))?;
- // Auto-commit uncommitted changes if they exist
- if repo.is_dirty()? {
- handle_commit_changes(message, &config.commit_generation)?;
- }
-
// Run pre-merge checks unless --no-verify was specified
+ // Do this BEFORE committing so we fail fast if checks won't pass
if !no_verify && let Ok(Some(project_config)) = ProjectConfig::load(&repo.worktree_root()?) {
let worktree_path = std::env::current_dir().map_err(|e| {
GitError::CommandFailed(format!("Failed to get current directory: {}", e))
@@ -64,6 +60,12 @@ pub fn handle_merge(
)?;
}
+ // Auto-commit uncommitted changes if they exist
+ // Only do this after pre-merge checks pass
+ if repo.is_dirty()? {
+ handle_commit_changes(message, &config.commit_generation)?;
+ }
+
// Track operations for summary
let mut squashed_count: Option<usize> = None;