Merge active swarm worktrees into the main branch after testing.
npx skills add https://github.com/jmylchreest/aide --skill worktree-resolve
Please help me install this Agent Skill. Skill: worktree-resolve Source: https://github.com/jmylchreest/aide/tree/main/skills/worktree-resolve Command: npx skills add https://github.com/jmylchreest/aide --skill worktree-resolve
Merge multiple swarm worktrees back into the main branch after testing to restore a clean, centralized repository state and prevent drift between branches.
Run the worktree resolution workflow to merge all agent worktrees back into the main branch after swarm completion.
High-intent search queries and answers about installing and using this skill.
To merge git worktrees back into the main branch, the workflow lists active worktrees, validates their completion status, runs tests, performs safe merges, resolves conflicts intelligently, and prunes obsolete worktrees to restore a clean repository state.
The best way to resolve conflicts when consolidating multiple feature worktrees is to perform dry-run merge checks first, then intelligently combine overlapping changes from each agent's worktree before removing the merged branches.
To clean up and prune git worktrees after merging, the workflow removes merged worktrees from the file system and deletes their corresponding metadata entries from state files to prevent branch drift and restore a centralized workspace.
Yes, you can verify worktree readiness before merging by checking the agent completion status in metadata files and performing dry-run merge checks against the main branch to ensure no conflicts will block the process.
You need to merge worktrees back into main after multi-agent testing to restore a clean, centralized repository state and prevent drift between isolated feature branches created during the swarm run.
schmugEnumerate active Claude workers and their git worktrees with status and commits.
GGPromptsMerge feature branches into main and clean up worktrees using Git.
qiphonAutomate multi-swarm orchestration across mesh, hierarchical, and star topologies.
ksciusResolve Git merge conflicts and verify buildable, test-passing state.
