Agent Skills
› asJEI/vscode
› sync-upstream
sync-upstream
GitHub将当前会话分支基于最新上游进行变基，以同步上游变更。处理冲突时优先保留上游逻辑并适配会话工作，最后验证编译和功能目标是否达成。
Trigger Scenarios
需要同步上游最新代码到当前分支
解决本地分支与远程主干的冲突
Install
npx skills add asJEI/vscode --skill sync-upstream -g -y
SKILL.md
Frontmatter
{
"name": "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."
}
Update Branch
Rebase the current session branch onto the latest upstream so the work stays grounded in origin.
Workflow
- If there are uncommitted changes, use the
/commitskill to commit them first. - Fetch the latest upstream and rebase onto it:
Use the appropriate base branch if it is notgit fetch origin git rebase origin/mainmain.
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 addthe files andgit 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.
Version History
- ce4db66 Current 2026-07-19 08:58
