git-sync-worktree
CommunityKeep your worktree branch rebased and safe
Software Engineering#git#worktree#rebase#conflict resolution#documentation workflow#cli automation#branch synchronization
Authorsaxonthune
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill prevents worktrees from drifting behind the trunk by rebasing the worktree’s claude branch onto the latest trunk commits.
Core Features & Use Cases
- Branch-safe rebase sync: Detects the current branch and derives the trunk branch name, then performs a rebase of the worktree branch onto the trunk.
- Safety guardrails: Refuses to run if you are on the trunk branch or if there are uncommitted changes, reducing the chance of accidental history corruption.
- Conflict guidance: Stops on rebase conflicts and explains the standard resolution flow so you can continue or abort safely.
Use case: You are actively developing in a worktree branch (for example, _claude1) and need to periodically incorporate new trunk changes without losing your work.
Quick Start
Run the sync script from within your worktree to rebase your current claude branch onto the derived trunk branch.
Dependency Matrix
Required Modules
None requiredComponents
scripts
💻 Claude Code Installation
Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.
Please help me install this Skill: Name: git-sync-worktree Download link: https://github.com/saxonthune/carta/archive/main.zip#git-sync-worktree Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.