Merge trunk_claude* worktree branches into trunk and sync with origin.
npx skills add https://github.com/saxonthune/carta --skill git-sync-trunk
Please help me install this Agent Skill. Skill: git-sync-trunk Source: https://github.com/saxonthune/carta/tree/main/.claude/skills/git-sync-trunk Command: npx skills add https://github.com/saxonthune/carta --skill git-sync-trunk
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.
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.
High-intent search queries and answers about installing and using this skill.
To merge worktree branches into trunk, run the sync script from the trunk branch. It automatically finds branches matching the trunk_claude* naming pattern and merges only those with commits ahead of trunk into the main branch.
Yes, you can pull origin/trunk when the remote is behind. The sync process optionally syncs the local trunk with the configured remote, keeping your repository histories aligned automatically after merging worktrees.
When merge conflicts occur during a trunk sync, the process halts immediately. It provides clear external steps to resolve the conflicts and supports resuming the resolved merge afterwards without losing your worktree changes.
Git trunk syncing requires running on a trunk branch without a _claude suffix. It targets trunk_claude* branches specifically, detecting which worktree branches have commits ahead of trunk before performing the merge.
You need to consolidate worktree branches when AI agents or contributors create commit-bearing branches that require their changes merged into trunk. This synchronization ensures the codebase stays aligned before initializing new worktrees.
Limitations include halting on merge conflicts for manual resolution, requiring the script to run from the trunk branch, and only processing branches following the trunk_claude* naming convention with ahead-of-trunk detection.
saxonthuneRebase a worktree branch onto the latest trunk with safety checks.
luanSync a Git-Spice repository with its remote trunk and clean merged branches.
phenobarbitalCreate and manage isolated git worktrees for feature branches.
nsheapsSynchronize feature branches with their PR base using git and gh.
