Do I need to manually lock every file before Claude edits it?

While you can use /worktree-claim for manual control, the skill is designed to automatically acquire locks during Write or Edit operations to ensure hands-free conflict prevention.

How does this skill prevent file conflicts across worktrees?

It uses a centralized registry to implement file-level locking. Before Claude performs a write or edit operation, a pre-tool hook checks if another instance has claimed that file and blocks the action if a lock is present.

Can I share design decisions between different Claude instances?

Yes, the /worktree-decision command allows you to log architectural choices to a shared registry, which can then be viewed or pulled by other instances using /worktree-sync.

What happens if a Claude instance crashes while holding a lock?

The skill includes a heartbeat mechanism that updates every 30 seconds. If an instance fails to check in for 5 minutes, it is marked as stale and its locks are automatically released.

Worktree Coordination

Name: Worktree Coordination
Author: yonatangross

byyonatangross

•

개발자 도구

Manages multiple parallel Claude Code instances across Git worktrees to prevent file conflicts and synchronize architectural decisions.

The Worktree Coordination skill is an essential utility for developers running multiple Claude Code instances simultaneously using Git worktrees. It implements a robust synchronization layer that includes file-level locking to prevent accidental overwrites, instance heartbeat monitoring to clean up stale sessions, and a shared decision log to maintain architectural consistency across parallel development streams. By centralizing instance status and file ownership in a local registry, it enables seamless multi-tasking and complex refactors without the risk of Git merge conflicts or fragmented logic.

주요 기능

01Real-time instance monitoring with heartbeat-based stale session cleanup

02Centralized architectural decision logging for cross-instance context syncing

0329 GitHub stars

04Automated file-level locking to prevent simultaneous edits across worktrees

05Conflict detection tools to verify branch compatibility before committing

06Pre-tool hooks that block conflicting write operations automatically

사용 사례

01Synchronizing high-level design choices between different parts of a large-scale refactor

02Managing multiple feature branches simultaneously with independent Claude instances

03Preventing accidental merge conflicts when editing shared utility files across worktrees

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add yonatangross/skillforge-claude-plugin worktree-coordination

For use in Claude.ai and ChatGPT

Download Skill