Merge parallel worktrees into a unified branch with 3-way conflict resolution.
npx skills add https://github.com/axiomantic/spellbook --skill merging-worktrees
Please help me install this Agent Skill. Skill: merging-worktrees Source: https://github.com/axiomantic/spellbook/tree/main/skills/merging-worktrees Command: npx skills add https://github.com/axiomantic/spellbook --skill merging-worktrees
Consolidate parallel worktrees into a single, coherent branch without feature loss or regressions.
Provide the base_branch and the list of worktrees, then execute the merge workflow to produce a unified branch.
High-intent search queries and answers about installing and using this skill.
To merge parallel git worktrees safely, you need a 3-way merge integration process that consolidates concurrent branches into a single, feature-complete branch. This ensures dependency-aware merge ordering and verifies interface contracts remain intact.
3-way conflict analysis for branch management examines the base branch and two diverging worktrees to resolve conflicts while protecting explicit interface contracts. It prevents feature loss during multi-team consolidation by analyzing the three distinct branch states.
Consolidate multiple worktrees by applying dependency-aware merge ordering, which sequences branch integrations based on their dependencies to prevent cascading failures. You provide a base branch and a list of worktrees to execute the merge workflow.
Yes, this worktree merge workflow is specifically designed for multi-team version control environments where multiple worktrees evolve concurrently. It enforces mandatory tests after each merge round and produces detailed merge logs for team tracking.
Merging worktrees with concurrent branch updates requires explicit interface contracts and mandatory testing after each round to prevent regressions. The process is limited by the need for dependency-aware ordering to avoid cascading failures during consolidation.
FutureAtomsCreate, list, remove, and move Git worktrees for parallel development.
vobbilisEnforce pre-merge verification and clean merge strategies for Git workflows.
jonnymuirManage Git worktrees and PRs with a dev-first branching model.
theslashdojoMerge Git branches with fast-forward, no-ff, three-way, and squash strategies.
