Can I sync all my worktrees at once?

Yes, the skill includes references to automation scripts that can iterate through multiple worktree directories to perform bulk fetch and update operations.

How does this skill handle merge conflicts?

The skill provides a structured workflow to identify conflicted files via git status, offers guidance on resolution, and facilitates the 'git rebase --continue' or 'git merge' finalization.

What is a Git worktree sync?

Git worktree sync is the process of updating multiple checked-out branches in separate directories with the latest changes from a remote repository or the main branch.

Should I use rebase or merge for syncing worktrees?

This skill supports both; rebase is preferred for maintaining a clean, linear history, while merge is useful for preserving the specific branch history during the sync process.

Why is worktree synchronization important for ProjectOdyssey?

As a Mojo training framework, keeping worktrees in sync ensures that feature development stays compatible with the evolving core framework and avoids massive merge debt.

Git Worktree Sync

Name: Git Worktree Sync
Author: mvillmow

bymvillmow

•

開発者ツール

Synchronizes Git worktrees with remote repositories and main branches to ensure feature branches remain current and conflict-free.

概要

Git Worktree Sync is a specialized Claude Code skill designed to streamline the management of multiple Git worktrees within a development environment. It provides automated workflows for fetching remote updates, pulling changes into the main branch, and rebasing or merging those changes into active feature branches. This skill is particularly valuable for developers working on long-running feature branches, as it helps prevent significant divergence from the main codebase and facilitates early conflict resolution through standardized git commands and project-specific best practices.

主な機能

Step-by-step conflict resolution guidance and error handling
12 GitHub stars
Seamless synchronization between main and feature branches
Bulk synchronization scripts for managing multiple worktrees simultaneously
Automated remote fetching across all active worktrees
Support for both rebase and merge-based update strategies

ユースケース

Efficiently resolving complex merge conflicts across isolated development environments
Maintaining long-running feature branches against a rapidly moving main branch
Preparing a clean, linear branch history before creating or updating a Pull Request

概要

主な機能

Step-by-step conflict resolution guidance and error handling
12 GitHub stars
Seamless synchronization between main and feature branches
Bulk synchronization scripts for managing multiple worktrees simultaneously
Automated remote fetching across all active worktrees
Support for both rebase and merge-based update strategies

ユースケース

Efficiently resolving complex merge conflicts across isolated development environments
Maintaining long-running feature branches against a rapidly moving main branch
Preparing a clean, linear branch history before creating or updating a Pull Request