agent-customization
**WORKFLOW SKILL** — Create, update, review, fix, or debug VS Code agent customization files (.instructions.md, .prompt.md,…
@microsoftInstall SkillDevelopment
Skill
/sync-upstream
Update a stale session branch by rebasing onto the latest origin. Use when the upstream has moved significantly and the session needs to catch up, resolving conflicts by preserving upstream changes and adapting session work to fit.
Claude Code
$ npx -y skills add microsoft/vscode --skill sync-upstream --agent claude-code
Codex
$ npx skills add microsoft/vscode --skill sync-upstream -a codex -y
Cursor
$ npx skills add microsoft/vscode --skill sync-upstream -a cursor -y
Gemini CLI
$ npx skills add microsoft/vscode --skill sync-upstream -a gemini-cli -y
GitHub Copilot
$ npx skills add microsoft/vscode --skill sync-upstream -a github-copilot -y
OpenCode
$ npx skills add microsoft/vscode --skill sync-upstream -a opencode -y
Windsurf
$ npx skills add microsoft/vscode --skill sync-upstream -a windsurf -y
SKILL.md
sync-upstream.SKILL.mdname: sync-upstream description: Update a stale session branch by rebasing onto the latest origin. Use when the upstream has moved significantly and the session needs to catch up, resolving conflicts by preserving upstream changes and adapting session work to fit.
<!-- Customize this skill and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
Update Branch
Rebase the current session branch onto the latest upstream so the work stays grounded in origin.
Workflow
1. If there are uncommitted changes, use the `/commit` skill to commit them first. 2. Fetch the latest upstream and rebase onto it:
git fetch origin git rebase origin/main
Use the appropriate base branch if it is not `main`.
Conflict Resolution
When conflicts arise, **upstream always wins**:
- **Never alter upstream logic, APIs, or patterns** to accommodate session changes.
- **Adapt session work** to fit the new upstream — rename, restructure, or rewrite as needed while preserving the session's goals.
- After resolving each conflict, `git add` the files and `git rebase --continue`.
Validation
After the rebase completes, verify the result still compiles and meets the session's objectives. If session changes no longer make sense against the updated upstream, explain what changed and propose a revised approach.
Stats
195,361
Stars
43,837
Forks
Active
Maintenance
TypeScript
Language
MIT
License
Last commit
Created
195k26 skills1 MCP
Stars on GitHub
Momentum
- stars in total
- 195.3k
Other skills on vscode.
@microsoftInstall Skillchronicle
Analyze Copilot session history for standup reports, usage tips, session search, and session reindexing. Use when the user asks…
@microsoftInstall Skillcreate-canvas
Create a Copilot extension canvas at user, workspace, or plugin scope.
@microsoftInstall Skillcreate-hook
Create a hook (.json) to enforce policy or automate agent lifecycle events.
@microsoftInstall Skillcreate-instructions
Create an instructions file (.instructions.md) for a project rule or convention.
@microsoftInstall SkillMore skills from other plugins.
Auto-invoked
brainstorming
You MUST use this before any creative work - creating features, building components, adding functionality, modifying behavior, or…
@obraInstall Skillask-matt
Ask which skill or flow fits your situation. A router over the skills in this repo.
@mattpocockInstall SkillAuto-invoked
Questions about sync-upstream.
- Which coding agents can use sync-upstream?
- sync-upstream installs in Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot, OpenCode and Windsurf with the skills CLI, using each agent's flag shown on this page. Flowy's auto-invocation, which fires a skill when your prompt matches, runs in Claude Code only.