swain-sync

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.

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.

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.

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.

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.

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.