resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
- License 许可
- MIT
- 最近更新
- 2026-10-13
- Stars
- ★ 1
- 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
- 参考文档agents/openai.yaml113 B
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.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
04 同仓库更多 Skills
review
检查代码质量、风险和可维护性。
research
整理资料、比较证据并形成结构化结论。
report
将分析结果组织为清晰的专业报告。
mindmesh-builtin-workout-planner-v1
当用户需要根据目标、经验、设备、时间和身体限制设计渐进训练时使用。
mindmesh-builtin-user-story-writer-v1
当用户需要把需求整理成用户故事、拆分故事或编写验收标准时使用。
mindmesh-builtin-trip-planner-v1
当用户需要在预算、交通、节奏和兴趣之间安排逐日行程时使用。