skills.rest
aadorian
aadorianCOMMUNITY
Explore all skills by this author →
GitHub

sync-upstream

Rebase a stale session branch onto the latest upstream and resolve merge conflicts.

Updated Mar 28, 2026
Search Tags:#git#validation#branches#rebase#conflicts#upstream
One-click install
npx skills add https://github.com/aadorian/VSCode_Readme --skill sync-upstream-aadorian
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: sync-upstream
Source: https://github.com/aadorian/VSCode_Readme/tree/main/education/sessions-chat-and-agents/sessions/skills/sync-upstream
Command: npx skills add https://github.com/aadorian/VSCode_Readme --skill sync-upstream-aadorian

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you bring a long-lived session branch back in sync with upstream so work does not drift too far from the latest changes.

Core Features & Use Cases

  • Rebases the current branch onto the latest upstream branch after local changes are committed.
  • Resolves conflicts by preserving upstream behavior and adapting session work to the new codebase.
  • Validates the result after rebase so you can confirm the branch still builds and remains useful for the session goal.
  • Use it when upstream has moved significantly, when your branch is stale, or when a feature needs to be adjusted to fit new platform changes.

Quick Start

Use the sync-upstream skill to rebase my current session branch onto origin main and resolve any conflicts while keeping upstream changes intact.

Frequently Asked Questions about sync-upstream

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

FAQPage Schema
How do I rebase a stale git branch onto the latest upstream?▼

To rebase a stale git branch, commit local changes first, then rebase onto the latest upstream branch, resolving conflicts by favoring upstream behavior and adapting your session work to the new codebase.

Why does my session branch have merge conflicts after upstream moved?▼

Merge conflicts occur because your session branch drifted from origin. Resolve them by rebasing onto the latest upstream, preserving upstream changes, and adapting your session work to fit the updated codebase.

When do I need to sync my branch with upstream?▼

You need to sync with upstream when the mainline has moved significantly, your branch is stale, or your feature needs adjustment to fit new platform changes while preserving ongoing session work.

What is the best way to resolve git conflicts when catching up to main?▼

The best way to resolve conflicts when catching up to main is favoring upstream changes during conflict resolution, then adapting your session work to the new codebase to preserve mainline behavior.

How do I validate a git branch after rebasing onto origin?▼

Validate a rebased branch by confirming it still compiles and meets your original session objective, ensuring the updated branch remains useful after integrating the latest upstream changes.

Can I rebase a branch with uncommitted local changes?▼

No, rebasing requires committing local changes first. You must commit all ongoing work before rebasing the session branch onto the latest upstream to preserve your progress during conflict resolution.

Related Skills

Explore More Software Engineering Skills→
cbleckercblecker
5

rebasing-branch

Rebase a feature branch onto an updated base branch with conflict guidance.

Community
Basic
Z1-TestZ1-Test

github-pr-flow

Automate GitHub pull request lifecycle from branch creation to merge.

Official
Intermediate
tenstorrenttenstorrent
4

shepherd-emule-pr

Review and locally rebase tt-emule pull requests with JIT compile-probes.

Official
Advanced
zgsm-aizgsm-ai
4.4k

roo-conflict-resolution

Resolve Git merge conflicts using commit history and code intent.

Official
Advanced