Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Add merge validation progress and update README
Maximilian Roosdfaf700afc3d
diff --git a/README.md b/README.mdindex a2adf908e..3fd4425cd 100644--- a/README.md+++ b/README.md@@ -252,3 +252,4 @@ This project is pre-release. Breaking changes are expected and acceptable. The b## LicenseMIT+testdiff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 2a7ca1a34..191711e73 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -20,6 +20,10 @@ pub fn handle_merge() -> Result<(), GitError> {let repo = Repository::current();+ // Show progress for initial validation+ crate::output::progress(format!("🔄 {CYAN}Validating merge...{CYAN:#}"))+ .map_err(|e| GitError::CommandFailed(e.to_string()))?;+// Get current branchlet current_branch = repo.current_branch()?.ok_or(GitError::DetachedHead)?;