worktree-reconcile

Reconcile conflicting .worktrees/* lanes by merging donor lanes into a surviving lane.

Updated Aug 23, 2026

Search Tags:#git #workflow #worktree #conflict-resolution #reconcile #lane

Ready to run

npx skills add https://github.com/hack-ink/codexlab --skill worktree-reconcile

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: worktree-reconcile
Source: https://github.com/hack-ink/codexlab/tree/main/.codex/skills/worktree-reconcile
Command: npx skills add https://github.com/hack-ink/codexlab --skill worktree-reconcile

SYSTEM DOCUMENTATION & REQUIREMENTS

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.

Frequently Asked Questions about worktree-reconcile

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I reconcile conflicting git worktree lanes in the same repository?▼

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.

What is the best way to consolidate multiple git worktrees without deleting them?▼

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.

Does worktree reconciliation preserve uncommitted work during a lane merge?▼

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.

Can I choose a specific merge strategy like cherry-pick for worktree conflict resolution?▼

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.

When do I need to resolve conflicts among .worktrees/* lanes?▼

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.