swain-sync

Automate git worktree syncing with fetch, merge or rebase, and push.

1|Updated Mar 10, 2026

Search Tags:#automation #git #worktrees #merge #rebase #adr-check

Ready to run

npx skills add https://github.com/cristoslc/south-portland-school-budget-FY27 --skill swain-sync

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: swain-sync
Source: https://github.com/cristoslc/south-portland-school-budget-FY27/tree/main/.agents/skills/swain-sync
Command: npx skills add https://github.com/cristoslc/south-portland-school-budget-FY27 --skill swain-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires python3, and includes scripts (resource) components.

What problem does it solve?

This Skill automates complex Git workflows across worktrees, reducing manual toil and human error when syncing with upstream, handling merges/rebases, ADR checks, index rebuilds, and pushes.

Core Features & Use Cases

Fetch upstream, merge or rebase on the current branch
Stage changes and enforce gitignore hygiene
Run ADR compliance checks and rebuild artifact indexes
Generate descriptive commit messages and push to upstream
Works with linked worktrees and main worktrees

Quick Start

Trigger the swain-sync skill to fetch upstream, merge or rebase, stage changes, perform ADR checks, rebuild indexes, and push.

Frequently Asked Questions about swain-sync

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

FAQPage Schema

How do I automate git worktree syncing with upstream branches?▼

Automate git worktree syncing by triggering the skill to fetch upstream, merge or rebase changes, stage them, and push to the current branch's upstream. It handles stash management, ADR checks, and artifact index rebuilds end-to-end.

Does this git automation tool handle merge conflict resolution for config files?▼

Yes, this git automation tool applies conflict resolution preferences specifically for config files during merge or rebase operations. It detects your worktree context and manages conflicts while enforcing gitignore hygiene across linked and main worktrees.

Can I use this automation for trunk-based development workflows with multiple worktrees?▼

Yes, you can use this automation for trunk-based development and multi-worktree workflows. It detects the active worktree context, fetches upstream changes, runs ADR compliance checks, rebuilds artifact indexes, and pushes updates automatically.

Do I need Python 3 installed to run these git worktree automation scripts?▼

Yes, you need Python 3 installed as a dependency to run these git worktree automation scripts. The skill requires the Python 3 runtime to execute its scripts that handle fetching, merging, staging, and pushing operations.

What's the best way to enforce gitignore hygiene and generate descriptive commit messages?▼

The best way to enforce gitignore hygiene and generate descriptive commit messages is using this automation. It stages changes while checking gitignore compliance, then automatically generates descriptive commit messages before pushing to the upstream branch.

Why does my git rebase fail when switching between linked worktrees with uncommitted changes?▼

Git rebase can fail when uncommitted changes conflict with incoming upstream updates. This automation handles stash management automatically during worktree syncing, preserving your changes while fetching, rebasing, and pushing without manual intervention.