sync

@thettwe · 收录于 1 周前

Update the current feature branch with the latest changes from its base branch (rebase by default, merge when asked). TRIGGER when the user says "sync with main", "update my branch", "rebase on main", "catch up with main", "pull in main", "bring this branch up to date", "merge main into this branch", "/nyann:sync". Trigger on "resolve conflicts" only when the user specifically ties it to syncing — otherwise that's a manual resolve. Do NOT trigger on "pull" alone (that's a different operation for updating main itself). Do NOT trigger on main/master/develop — those are long-lived branches and sync-skill refuses them. Do NOT trigger on commit / push / PR — those are separate skills.

场景分支同步代码合并

适合你，如果经常需要将特性分支与主分支保持同步

/ 下载安装

https://github.com/thettwe/nyann/tree/main/skills/sync ↗

/ 通过 npx 安装 校验哈希

npx oh-my-skill add thettwe/nyann/sync

/ 通过 bash 安装

curl -fsSL https://oh-my-skill.com/install.sh | bash -s -- thettwe/nyann/sync

/ 已经装过?验证本机副本,不用重装

npx oh-my-skill verify thettwe/nyann/sync

安装目标可用 --agent / --scope 或 --to 明确指定;省略时只会在唯一已存在的 agent 目录上自动选择,零命中或多命中会停止并提示。content_hash 缺失或不一致均拒装。

6GitHub stars

~1K上下文体积 · 单文件

索引托管

登录即可评论;带「已验证安装」的,是发布者名下有本店的安装或持有记录。

…