Reconcile Worktrees

Safely consolidate one or more isolated git worktrees (for example left behind by parallel background agents, or from the fix-batch skill) into the main working tree, without committing or merging blindly. Use whenever asked to "reconcile the worktrees", "merge these agent branches", "bring the worktree changes back into main", "clean up the worktrees", or when multiple agent worktree directories exist and their changes need to land in the primary checkout. It is the landing step of the kit spine: new-task authors, fix-batch dispatches to isolated agents, reconcile-worktrees consolidates the verified results, and doc-sync follows it. Also use it proactively after a fix-batch run once every spawned agent has been individually verified, as the natural next step.

hams-ollo Updated 2 repo stars

File contents

hams-ollo/zen-agent-skills commit 747729421a

Frequently asked questions

npx get-skill add hams-ollo/reconcile-worktrees