worktree-reconcile

To consolidate multiple worktrees touching the same code, the tool identifies a surviving lane and merges donor lanes into it using a chosen strategy. It reconciles conflicts in the repository without creating or deleting any existing worktrees.

The best approach is selecting a surviving lane and merging donor lanes into it using a strategy like rebase, cherry-pick, or merge. It reconciles the worktrees in place without creating or deleting any worktree directories.

Yes, worktree reconciliation preserves uncommitted work by applying guardrails to avoid accidental data loss. It safely identifies a surviving lane and reconciles donor lanes into it while protecting your current changes.

Yes, you can choose a merge strategy for worktree conflict resolution. The tool supports rebase, cherry-pick, and merge strategies to reconcile donor lanes into the surviving lane, allowing you to control how the code integration is handled.

You need to resolve conflicts among .worktrees/* lanes when two or more worktree lanes touch the same code and require reconciliation. This happens when you need a clean, single-lane outcome from multiple separate worktrees working on the same files.