worktree-reconcile
OfficialConsolidate conflicting worktree lanes into one.
Authorhack-ink
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Reconciles conflicting .worktrees/* lanes within the same repository by selecting a surviving lane and coordinating donor lanes without creating or deleting worktrees.
Core Features & Use Cases
- Identifies the surviving lane first and merges donor lanes into it using a chosen strategy (rebase, cherry-pick, or merge).
- Preserves uncommitted work and provides guardrails to avoid accidental data loss.
- Use Case: when multiple lanes exist as separate worktrees touching the same code and you need a clean, single-lane outcome.
Quick Start
Identify the surviving lane and apply a reconciliation strategy to consolidate donor worktrees.
Dependency Matrix
Required Modules
None requiredComponents
Standard package💻 Claude Code Installation
Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.
Please help me install this Skill: Name: worktree-reconcile Download link: https://github.com/hack-ink/codexlab/archive/main.zip#worktree-reconcile Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.