Retry deferred Git worktree merges into the main branch.
npx skills add https://github.com/adamfeldman/compound-workflows --skill do-merge
Please help me install this Agent Skill. Skill: do:merge Source: https://github.com/adamfeldman/compound-workflows/tree/main/plugins/compound-workflows/skills/do-merge Command: npx skills add https://github.com/adamfeldman/compound-workflows --skill do-merge
This Skill helps resolve issues where a worktree merge into the main branch failed, allowing you to retry the merge process and clean up unmerged branches.
/do:merge will help you resolve these conflicts and finalize the merge.Run the do:merge skill to merge any unmerged worktree branches into main.
High-intent search queries and answers about installing and using this skill.
To retry a failed git worktree merge, you can run a recovery process that detects unmerged session worktrees, verifies the repository state, and re-executes the merge with conflict handling to finalize the branch integration.
Conflict resolution for unmerged worktree branches provides options for automatic resolution of additive changes and user-guided review, ensuring robust handling when retry exhaustion or a dirty main branch occurs during the merge.
When multiple unmerged git worktrees are detected during session recovery, the process prompts you for manual branch selection, whereas a single unmerged branch is automatically selected for the merge retry.
Yes, you can recover a worktree merge that failed during session compaction by identifying the specific unmerged session worktree and executing a targeted merge script to resolve the deferred integration.
When retrying a merge with a dirty main branch, the process includes robust handling to verify the repository state first, preventing unsafe merges and managing retry exhaustion if conflicts cannot be automatically resolved.
prulloacCreate isolated Git worktrees with automatic safety verification and setup.
pkuppensClean up merged branches, worktrees, GitHub Actions runs, and tmp directories.
divad12Merge worktree changes into main, stop the dev server, and remove the worktree and branch.
chiptoe-svgDetect and merge upstream updates for git branch-distributed skills.