Syncs Git worktrees by fetching remote and rebasing or merging main into feature branches.
npx skills add https://github.com/mvillmow/ml-odyssey --skill worktree-sync
Please help me install this Agent Skill. Skill: worktree-sync Source: https://github.com/mvillmow/ml-odyssey/tree/main/.claude/skills/worktree-sync Command: npx skills add https://github.com/mvillmow/ml-odyssey --skill worktree-sync
What problem does it solve? This Skill automates the process of synchronizing Git worktrees with remote and main branch changes, ensuring all your parallel development environments are always up-to-date. It eliminates manual fetching and rebasing, saving time and preventing conflicts.
Core Features & Use Cases:
Quick Start: Use the worktree-sync skill to sync all your git worktrees with the latest remote changes.
High-intent search queries and answers about installing and using this skill.
Synchronizing Git worktrees with main branch changes involves fetching remote updates, then rebasing or merging feature branches against the updated main. This Skill automates that workflow—fetching from origin, pulling main, and rebasing feature branches—so all your parallel development environments stay current without manual commands.
Rebasing rewrites feature branch history on top of main, creating a linear commit history ideal for long-running branches. Merging preserves both histories and is safer when branches are shared. This Skill supports both strategies; choose rebase for cleaner history or merge to preserve parallel development context.
When rebase encounters conflicts, Git pauses and marks conflicting files. Resolve conflicts manually, stage the fixed files, then run git rebase --continue to resume. This Skill handles the rebase workflow and signals when conflict resolution is needed, then verifies the result with git log.
Yes. Synchronizing worktrees with main before opening or updating PRs prevents merge conflicts and ensures your feature branch is based on current code. This Skill is designed for exactly this use case—keeping feature branches in separate worktrees aligned with remote main before PR operations.
Significant divergence increases conflict risk but doesn't prevent synchronization. This Skill fetches latest main changes and rebases or merges your feature branch against them, surfacing conflicts for resolution. Regular synchronization prevents extreme divergence by keeping branches current throughout development.
No. This Skill includes the fetch step as part of its workflow—it pulls updates from origin automatically before syncing feature branches. You only need to ensure your local repository exists and you're working with standard Git worktrees.
theslashdojoManage git remotes and synchronize local branches with remote refs.
HomericIntelligenceFetch remote changes, update main, and rebase or merge Git worktrees.
ousiassResolve GitHub pull request merge conflicts using an isolated Git worktree.
alangebAutomate git worktree synchronization via rebase and fast-forward merges.
