Can I sync all my worktrees at once?

Yes, the skill includes references for running automated sync scripts that can update all active worktrees in a project simultaneously.

How does this skill help with merge conflicts?

It provides a structured error-handling workflow that guides you through checking status, fixing files, and continuing the sync process once conflicts are resolved.

Is this specific to the Project Odyssey framework?

While the documentation references Project Odyssey, the underlying Git patterns and workflows are applicable to any project using Git worktrees.

Should I use rebase or merge for syncing worktrees?

The skill supports both; rebase is recommended for maintaining a clean linear history, while merge is available if you prefer to preserve the exact branch history.

What is the main benefit of using worktree-sync?

It ensures your isolated feature branches stay updated with the latest changes from the main branch, preventing massive merge conflicts and keeping your development environment current.

Worktree Sync

Name: Worktree Sync
Author: HomericIntelligence

byHomericIntelligence

•

开发者工具

Synchronizes Git worktrees with remote repositories and main branches to maintain up-to-date feature development environments.

The Worktree Sync skill streamlines the process of keeping multiple Git worktrees in sync with remote changes and the main development branch. It provides a standardized workflow for fetching updates, rebasing or merging main branch commits into long-running feature branches, and resolving merge conflicts specifically within a worktree-based environment. This ensures that feature branches remain current and ready for pull requests, significantly reducing integration friction during the development lifecycle.

主要功能

0114 GitHub stars

02Automated sync scripts for project-wide worktree management

03Pre-PR verification and branch state verification

04Standardized rebase and merge workflows for feature branches

05Multi-worktree remote fetching and main branch updates

06Step-by-step conflict resolution and error handling guidance

使用场景

01Synchronizing multiple concurrent development environments for a single repository

02Maintaining long-running feature branches against a rapidly changing main branch

03Resolving complex merge conflicts within isolated worktrees before submitting pull requests

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add homericintelligence/projectodyssey worktree-sync

For use in Claude.ai and ChatGPT

Download Skill