jacobpevans/sync-main
git-workflows/skills/sync-main/SKILL.md
Update main from remote and merge into current or all PR branches
$ install --global
skillsauthnpx skillsauth add jacobpevans/claude-code-plugins sync-mainInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: May 26, 2026, 7:45 AM21.1s1 file scanned
SKILL.md
- name:
- sync-main
- description:
- Update main from remote and merge into current or all PR branches
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
- Sync main:
git fetch --all --prune --force && git pull(inmain/) - Check for updates:
git fetch origin --force 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(notconflict) in step 5, mergeorigin/mainusinggit merge origin/main --no-edit. Branches already classified asconflictin step 5 are skipped entirely — no merge is attempted on them, so nogit merge --abortis 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
--theirsor--ours - Force push unless explicitly asked
- Skip reading conflicted files
Related Skills
- refresh-repo (github-workflows) — Full repo sync including PR status and worktree cleanup
- rebase-pr (github-workflows) — Rebase-merge workflow that builds on a synced main
- git-workflow-standards (git-standards) — Branch hygiene and sync conventions
Related Skills
jacobpevans/self-hosted-runners
documentation
VerifiedTrustedCommunity
Use when editing GitHub Actions workflow files (.github/workflows/*.yml) in JacobPEvans repos. Documents when to target self-hosted RunsOn runners vs GitHub-hosted runners, the v3 label catalog used across the org, the required github.run_id segment, and the GitHub App allowlist prereq.
2SKILL.mdUpdated May 16, 2026
jacobpevans/refresh-repo
testing
VerifiedTrustedCommunity
Check PR merge readiness, sync local repo, cleanup stale worktrees; optional cross-repo sweep and stale-branch prune modes
2SKILL.mdUpdated Apr 28, 2026
jacobpevans/rebase-pr
tools
VerifiedTrustedCommunity
Local rebase-merge workflow for pull requests with signed commits
2SKILL.mdUpdated Apr 28, 2026
jacobpevans/gh-cli-patterns
tools
VerifiedTrustedCommunity
Canonical reference for all gh CLI command shapes used by skills in this plugin. Defines the placeholder convention, allowed --json fields, GraphQL fallback rules, -f/-F/--raw-field flag semantics, the PR-readiness gate, code-scanning alert query, review-thread fetch/count/resolve mutations, and heredoc bodies. Prevents Unknown JSON field errors and divergent query shapes.
2SKILL.mdUpdated Apr 28, 2026