Skill

sync-main

Update main from remote and merge into current or all PR branches

Install

npx claudepluginhub jacobpevans/claude-code-plugins --plugin git-workflows

Tool Access

This skill uses the workspace's default tool permissions.

Preview

Update the local `main` branch from remote and merge it into the current working branch,

SKILL.md

Similar Skills

using-git-worktrees

Creates isolated Git worktrees for feature branches with prioritized directory selection, gitignore safety checks, auto project setup for Node/Python/Rust/Go, and baseline verification.

superpowers

169.2k

subagent-driven-development

3 files

Executes implementation plans in current session by dispatching fresh subagents per independent task, with two-stage reviews: spec compliance then code quality.

superpowers

169.2k

dispatching-parallel-agents

Dispatches parallel agents to independently tackle 2+ tasks like separate test failures or subsystems without shared state or dependencies.

superpowers

169.2k

Stats

Parent Repo Stars2

Parent Repo Forks0

Last CommitMar 22, 2026

Actions

View Source View Plugin View on GitHub View README

Sync Main

Update the local main branch from remote and merge it into the current working branch, or all open PR branches when using the all parameter.

Scope Parameter

Usage	Scope
`/sync-main`	Current branch only
`/sync-main all`	All open PR branches

CURRENT REPOSITORY ONLY - This command never crosses into other repositories.

Prerequisites

You must be in a feature branch worktree (not on main itself)
The current branch should have no uncommitted changes

Single Branch Mode (Default)

Verify state: git branch --show-current, git status --porcelain
- STOP if on main or uncommitted changes
Find and sync main: cd ~/git/<repo>/main && git fetch --all --prune && git pull
Check for updates: git fetch origin main
Report: Show commits behind with git log --oneline HEAD..origin/main (informational only)
Merge: git merge origin/main --no-edit
- If already up-to-date: skip to step 7 and report
- If merge succeeds cleanly: continue to step 6
- If conflicts occur: STOP, do not push. Report conflict status and follow the Conflict Resolution section below
Push (only if merge succeeded cleanly): git push origin $(git branch --show-current)
Report: branch, main SHA, merge status

All Branches Mode (Orchestrator)

Report sync status for all open PR branches.

Steps

Get repo: gh repo view --json nameWithOwner
Update main: CRITICAL - must happen first
List open PRs: gh pr list --state open --json number,headRefName,title
Check each PR: Launch subagents in parallel (invoke superpowers:dispatching-parallel-agents). Each checks if behind main. Do NOT merge or push.
Report: repo, main SHA, merge-readiness for each PR (current/behind/conflict)
Sync conflict-free branches: For each branch classified as behind (not conflict) in step 5, merge origin/main using git merge origin/main --no-edit. Branches already classified as conflict in step 5 are skipped entirely — no merge is attempted on them, so no git merge --abort is needed. No confirmation required.
Report conflicting branches: Branches skipped due to pre-identified conflicts are reported for manual resolution

Conflict Resolution

Read files, understand both versions, combine intelligently, stage resolved files, commit.

DO NOT

Blindly use --theirs or --ours
Force push unless explicitly asked
Skip reading conflicted files

Related Skills

refresh-repo (git-workflows) — Full repo sync including PR status and worktree cleanup
rebase-pr (git-workflows) — Rebase-merge workflow that builds on a synced main
git-workflow-standards (git-standards) — Branch hygiene and sync conventions