philoserf/skills/vc-sync

Pre-loaded Context

• Branch: !git branch --show-current
• Status: !git status --short

Purpose

Sync the local repository to a clean, up-to-date state on the main branch.

Prerequisites

• gitup (git-repo-updater) — batch fetch + merge
• git sweep — delete local branches whose remote tracking branches are merged

Both are installed via the user's .Brewfile.

Process

1. Guard — Check for uncommitted changes. If dirty, present options: stash, commit, or abort. Do not proceed without user confirmation.
2. Switch to main — git checkout main
3. Update from remote — gitup . (fetch + merge)
4. Clean merged branches — git sweep

Commands

git stash list && git status --short

If the working tree is dirty, offer to stash before proceeding:

git stash push --include-untracked -m "WIP: stashing before vc-sync"

Do not proceed until the user confirms.

git checkout main && gitup . && git sweep

Failure Modes

• Dirty working tree — Guard step warns before proceeding. Commit or stash changes first.
• Merge conflict during gitup — Resolve the conflict manually, then re-run.
• git sweep skips branches — Branches without merged remote tracking branches are retained. This is expected.

Verification

After running, confirm the sync succeeded:

git status && git branch

Expected output:

On branch main
Your branch is up to date with 'origin/main'.

nothing to commit, working tree clean
* main

After sync (if stashed)

If changes were stashed from a feature branch, remind the user:

git checkout <original-branch> && git stash pop

Related

• vc-ship — The complement: ships changes from a feature branch via atomic commits and PR creation.

Do not use when

• Staging and committing local changes — use vc-ship
• Publishing a release — use obsidian-release
• Working a GitHub issue end-to-end — use fix-issue