skills.rest
the-agency-ai
the-agency-aiOFFICIAL
Explore all skills by this author →
WebsiteGitHub

Worktree Sync

Merge main into work branches, copy settings.json, and run sandbox-sync.

39|6|Updated Jan 5, 2026
Search Tags:#automation#git#development#merge#sync#branch
One-click install
npx skills add https://github.com/the-agency-ai/the-agency --skill worktree-sync-the-agency-ai
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: Worktree Sync
Source: https://github.com/the-agency-ai/the-agency/tree/main/.claude/skills/worktree-sync
Command: npx skills add https://github.com/the-agency-ai/the-agency --skill worktree-sync-the-agency-ai

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill automates the process of updating a feature or development branch with the latest changes from the main branch, ensuring consistency and reducing manual effort.

Core Features & Use Cases

  • Merge and Update Branches: Merges the main branch into the current work branch.
  • Copy Configuration Files: Synchronizes settings.json from the main checkout.
  • Run Sandbox Synchronization: Executes sandbox-sync to align development environments.
  • Report Changes: Provides a detailed report of files changed, settings updated, and new dispatches generated.
  • Use Case: Developers working on feature branches can quickly update their local environment with the latest main branch changes and confirm synchronization status.

Quick Start

Run the worktree sync tool to update your current branch with the latest changes from main, review the report, and act accordingly.

Frequently Asked Questions about Worktree Sync

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I sync my feature branch with the latest main branch changes?▼

To sync a feature branch, the tool merges the main branch into your current work branch, copies configuration files like settings.json, and runs sandbox-sync to align your local development environment automatically.

What is the best way to automate merging main into a development worktree?▼

Automating a worktree merge involves merging main into the current branch, copying settings.json from the main checkout, and executing sandbox-sync. This process generates a detailed report of changed files and updated settings.

Can I synchronize sandbox environments across multiple developer branches?▼

Yes, you can synchronize sandbox environments in multi-developer settings. The tool executes sandbox-sync to align development environments and provides a report of new dispatches generated and configuration updates.

Does worktree sync copy configuration files from the main checkout?▼

Yes, worktree sync copies configuration files by synchronizing settings.json from the main checkout into your current work branch to ensure your local configuration matches the main codebase.

Why do I need to run sandbox-sync after merging main into my work branch?▼

You need to run sandbox-sync after merging to align your development environment with the updated codebase. It ensures your sandbox configuration matches the newly merged main branch files and settings.

What limitations exist when automating branch updates in a multi-developer environment?▼

The automation requires direct access to the repository's scripts and settings to perform synchronization. It depends on the main checkout being available to copy settings.json and execute sandbox-sync successfully.

Related Skills

Explore More Software Engineering Skills→
markhazlettmarkhazlett
4

sync

Switch to the main branch and pull latest changes from the remote.

Community
Basic
mdmagnuson-creatormdmagnuson-creator

merge-conflicts

Merge target branches into source branches and resolve pull request conflicts.

Community
Advanced
takemi-ohamatakemi-ohama

sync-main

Merge the latest default branch into the current working branch.

Community
Intermediate
MarcoAntoliniMarcoAntolini
1

git-fetch-pull

Execute git fetch and pull commands to synchronize local branches with remote repositories.

Community
Intermediate