技能 2025-10-14 20:52 UTC
superpowers-skillslatest
版本【latest】由提交人 dvic 提交,主要更新类型为:工程代码迭代与常规维护。提交说明:Use flexible remote detection in pulling-updates skill (#11)。更新了核心功能模块并推进项目进度。
Commit提交信息原文
Use flexible remote detection in pulling-updates skill (#11)
The skill previously hardcoded 'upstream' as the remote and 'upstream/main'
as the merge source. This update makes it match the init script's logic:
- Detect tracking remote for current branch using git rev-parse
- Fall back to upstream, then origin if no tracking remote exists
- Use @{u} (upstream tracking branch) instead of hardcoded upstream/main
- Try fast-forward merge first before regular merge
- Handle both forked repos (origin) and upstream-based repos
This makes the skill work correctly regardless of whether the user has
a fork with 'origin' remote or an 'upstream' remote configuration.