Skills
.Work. You
Rest

git-sync-trunk

Community

Merge worktree work back into trunk.

Software Engineering#automation#git#worktrees#merge conflicts#branch merging#trunk sync#remote pull
Authorsaxonthune
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill solves the problem of consolidating ongoing work from multiple worktree branches back into the trunk branch so the codebase and documentation workspace stay synchronized.

Core Features & Use Cases

  • Safely merges worktree branches into trunk: Automatically finds branches following the naming pattern trunk_claude* and merges only those with commits ahead of trunk.
  • Optionally syncs with the remote trunk: Pulls from origin/trunk when the remote is behind the local trunk, keeping histories aligned.
  • Guides conflict resolution: Halts on merge conflicts and provides clear steps to resolve them externally, then supports resuming the resolved merge.

Quick Start

Run bash .claude/skills/git-sync-trunk/sync.sh from the trunk branch to merge all relevant worktree branches and sync trunk with the remote when configured.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 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-trunk
Download link: https://github.com/saxonthune/carta/archive/main.zip#git-sync-trunk

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.