jiantw83/jsc-marketplace
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

feat: 新增 jsc-matt 外掛，收錄 Matt Pocock 全套技能，指令為 /jsc-matt:*

Browse Source 
- 改編自 mattpocock/skills 1.2.3（MIT），含 engineering 與 productivity 共 25 個技能
- 技能間的呼叫名稱一律加上 jsc-matt: 前綴
- marketplace 與 README 補上 jsc-matt

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
root
2026-10-14 02:29:14 +00:00
co-authored by Claude Sonnet 5.5
parent acf79c0de6
commit 446dc294b5
80 changed files with 3416 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jsc-matt/skills/engineering/resolving-merge-conflicts/SKILL.md
+14
View File
@@ -0,0 +1,14 @@
---
name: resolving-merge-conflicts
description: "Use when you need to resolve an in-progress git merge/rebase conflict."
---
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.
4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.