laitszkin/merge-changes-from-local-branches
merge-changes-from-local-branches/SKILL.md
將 spec 相關的本地實作分支合併回當前分支。按 coordination.md 的建議順序解決衝突。
$ install --global
skillsauthnpx skillsauth add laitszkin/apollo-toolkit merge-changes-from-local-branchesInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: May 22, 2026, 6:41 AM151.4s2 files scanned
SKILL.md
- name:
- merge-changes-from-local-branches
- description:
- 將 spec 相關的本地實作分支合併回當前分支。按 coordination.md 的建議順序解決衝突。
技能目標
將 spec 相關的本地實作分支合併回當前分支。 依 coordination.md 順序處理衝突。
驗收條件
- 分支的變更被合併，且所有潛在衝突代碼被解決。
工作流程
1. 建立規格文檔基線認知
閱讀用戶指定的 spec。 查看目前分支狀態。 找到與 spec 相關的分支。
2. 合併分支及處理衝突
按照 coordination.md 的建議順序合併分支。
解決衝突時，確保 spec 要求的功能沒有被破壞。
3. 提交變更
使用 commit 技能，將變更提交到當前分支上，不需要 push 到 remote。
Related Skills
laitszkin/create-skill
development
VerifiedTrustedCommunity
Guides the agent through creating a new Agent Skill from scratch. Use when the user wants to build a skill, create a new skill, scaffold a skill directory, or author a SKILL.md. Do NOT use for optimising or rewriting existing skills — use 'optimise-skill' for that. Do NOT use for editing files that are already part of a skill. Do NOT use for creating non-skill content like documentation, scripts, or project files.
5SKILL.mdUpdated Jul 13, 2026
laitszkin/create-skill
development
VerifiedTrustedCommunity
Guides the agent through creating a new Agent Skill from scratch. Use when the user wants to build a skill, create a new skill, scaffold a skill directory, or author a SKILL.md. Do NOT use for optimising or rewriting existing skills — use 'optimise-skill' for that. Do NOT use for editing files that are already part of a skill. Do NOT use for creating non-skill content like documentation, scripts, or project files.
5SKILL.mdUpdated Jul 11, 2026
laitszkin/review-pr
development
VerifiedTrustedCommunity
Review a pull request — interactive PR selection via `gh`, 4-dimension code review (hallucinated code, architecture, performance, test validity), then post severity-graded comments with fix suggestions on the PR. Not for spec-based review — use `review` instead.
5SKILL.mdUpdated Jun 11, 2026
laitszkin/version-release
tools
VerifiedTrustedCommunity
協助完成自動化版本發佈。同步文檔、更新版本號、推送 tag 並建立 GitHub Release。
5SKILL.mdUpdated May 29, 2026