resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
- License 许可
- MIT
- 最近更新
- 2026-06-23
- Stars
- ★ 0
- Forks
- 0
01 前言 Front Matter
- name
- resolving-merge-conflicts
- description
- Use when you need to resolve an in-progress git merge/rebase conflict.
02 资源文件 1
- 参考文档SKILLS.md1.1 KB
03 SKILL.md 正文
-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
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.
-
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. -
Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
-
Stop at a clean handoff point. Once every conflict is resolved and the relevant checks are green, summarise any manual git commands still required to finish the merge or rebase. Leave staging, committing, and rebase continuation to the user unless they explicitly ask you to perform them.
04 同仓库更多 Skills
to-prd
Turn the current conversation into a PRD — no interview, just synthesis of what you've already discussed.
to-issues
Break a plan, spec, or PRD into independently-grabbable vertical slices using tracer-bullet slices.
tdd
Test-driven development. Use when the user wants to build features or fix bugs test-first, mentions "red-green-refactor", or wants integration tests.
implement
Implement a piece of work based on a PRD, a slice document, or a single approved slice.
handoff
Compact the current conversation into a handoff document for another agent to pick up.
diagnosing-bugs
Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.