skills.rest
ryanallen
ryanallenCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

sync-upstream

Pull upstream main changes and push them to origin main.

Updated Aug 23, 2026
Search Tags:#git#sync#branch#error-handling#merge-conflicts#upstream#origin
One-click install
npx skills add https://github.com/ryanallen/Studio --skill sync-upstream-ryanallen
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: sync-upstream
Source: https://github.com/ryanallen/Studio/tree/main/.claude/skills/sync-upstream
Command: npx skills add https://github.com/ryanallen/Studio --skill sync-upstream-ryanallen

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Syncs the local repository with an upstream remote by pulling from upstream main and pushing to origin main.

Core Features & Use Cases

  • Pull updates from the upstream remote's main branch and merge them locally.
  • Push merged changes to the origin's main branch to maintain alignment.
  • Handle common issues such as merge conflicts and authentication failures with guided steps.

Quick Start

Run the synchronization command to fetch upstream changes and push them to origin.

Frequently Asked Questions about sync-upstream

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

FAQPage Schema
How do I sync changes from an upstream remote to my origin repository?▼

To sync upstream changes to your origin repository, pull updates from the upstream main branch and push the merged changes to your origin main branch. This workflow requires both remotes to be configured as upstream and origin.

What is the best way to handle merge conflicts when pulling from upstream?▼

When pulling from upstream causes merge conflicts, the synchronization process includes guided steps for error-handling. You resolve the conflicts locally before successfully pushing the merged changes to your origin main branch.

Does syncing upstream require a rebase strategy?▼

No, the upstream sync does not use a rebase strategy. It specifically uses the git pull --no-rebase upstream main command to merge changes locally before pushing them to the origin main branch.

Why does my git push to origin fail with an authentication error during a sync?▼

An authentication failure during your git push to origin is a common error-handling scenario. The sync process includes guided steps to resolve authentication issues so you can successfully push merged upstream changes.

Can I use this sync workflow if I only have an origin remote configured?▼

No, you cannot use this workflow with only an origin remote. It requires that both remotes are explicitly configured as upstream and origin to pull updates and push the merged changes correctly.

Related Skills

Explore More Software Engineering Skills→
bakwankawabakwankawa

dual-remote-push

Pushes the current Git branch to both upstream and origin remotes on demand.

Community
Intermediate
MoonLadderStudiosMoonLadderStudios
12

fix-merge-conflicts

Fetch origin/main, merge into the current branch, resolve conflicts, and push.

Official
Intermediate
pluginagentmarketplacepluginagentmarketplace
1

collaboration

Manage remote Git repository operations including clone, fetch, pull, and push.

Community
Intermediate
chiptoe-svgchiptoe-svg

update-skills

Detect and merge upstream updates for git branch-distributed skills.

Community
Intermediate