skills.rest
voidful
voidfulCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

sync-upstream

Rebase a session branch onto the latest upstream while preserving upstream changes during conflicts.

1|Updated Apr 8, 2026
Search Tags:#git#version control#rebase#conflict resolution#upstream#branch sync
One-click install
npx skills add https://github.com/voidful/Aixlarity --skill sync-upstream-voidful
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: sync-upstream
Source: https://github.com/voidful/Aixlarity/tree/main/aixlarity-ide/src/vs/sessions/skills/sync-upstream
Command: npx skills add https://github.com/voidful/Aixlarity --skill sync-upstream-voidful

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Long-running session branches drift behind the upstream repository, causing stale code, merge conflicts, and broken assumptions. This Skill updates a stale branch by rebasing it onto the latest origin so session work stays grounded in current upstream code. ## Core Features & Use Cases - Guided Rebase Workflow: Fetches the latest origin and rebases the session branch onto the appropriate base branch, committing uncommitted changes first via the /commit skill. - Upstream-First Conflict Resolution: Enforces a strict rule that upstream logic, APIs, and patterns always win, adapting session work to fit rather than altering upstream code. - Post-Rebase Validation: Verifies the rebased result still compiles and meets session objectives, proposing a revised approach when session changes no longer make sense. - Use Case: A feature branch has been open for two weeks while main received dozens of commits. Use this Skill to rebase onto origin/main, resolve conflicts by adapting your changes to the new upstream APIs, and confirm the build still passes. ## Quick Start Ask the assistant to sync this session branch with the latest upstream and resolve any conflicts in favor of upstream.

Frequently Asked Questions about sync-upstream

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

FAQPage Schema
How do I update a stale branch with the latest upstream changes?▼

Fetch the latest origin and rebase your session branch onto it using git fetch origin followed by git rebase origin/main. Commit any uncommitted changes first so the rebase can proceed cleanly.

How to resolve rebase conflicts when upstream code has changed?▼

Upstream always wins during conflict resolution. Never alter upstream logic, APIs, or patterns; instead adapt your session work by renaming, restructuring, or rewriting it to fit the new upstream, then git add the files and run git rebase --continue.

Should I rebase or merge to sync with the main branch?▼

This workflow uses rebase to keep session work grounded in origin with a linear history. Rebase rewrites your commits on top of the latest upstream, which suits session branches that have not been shared publicly.

What happens if my changes no longer make sense after rebasing?▼

After the rebase completes, the result is validated to confirm it still compiles and meets the session objectives. If upstream changes invalidate your work, the Skill explains what changed and proposes a revised approach.

Can I rebase with uncommitted changes in my working tree?▼

No, uncommitted changes must be committed first before rebasing. The workflow directs you to commit pending changes using the /commit skill before fetching and rebasing onto upstream.

Related Skills

Explore More Software Engineering Skills→
olliecrowolliecrow

git-commit

Commit all uncommitted changes into small, logical commits with clear messages.

Community
Advanced
drndrn
23

rebase

Rebase the current Git branch onto the upstream default branch and force-push with lease.

Community
Advanced
aadorianaadorian

sync-upstream

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

Community
Intermediate
The-Vibe-CompanyThe-Vibe-Company
2.4k

resolving-merge-conflicts

Resolves in-progress git merge and rebase conflicts while preserving both change intents.

Official
Intermediate