resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
DeepseekModel
官方收录技能
★ 精选
质量 优秀 · 90
v1.0.0
获取
https://deepseekmodel.com/api/download.php?id=mattpocock-skills-skills-engineering-resolving-merge-conflicts-skill-md&format=skill
下载 .skill
标准格式，含 system_prompt 与 model_config，导入任意 Agent 框架即可使用
.skill 文件中 system_prompt 字段的实际内容。
name resolving-merge-conflicts description Use when you need to resolve an in-progress git merge/rebase conflict. 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.
Agent 识别该技能的关键词，点击任意一个即可复制。
该技能未提供触发词。
下载的 .skill 包内含以下字段。
| 字段 | 说明 |
|---|---|
| format | 格式标识（skill/v1） |
| skill_id | 技能唯一 ID |
| name | 技能名称 |
| version | 版本号 |
| description | 技能描述 |
| category | 所属分类（数组） |
| trigger_words | 触发词列表 |
| tags | 标签列表 |
| source | 来源标识 |
| source_url | 来源链接（本页地址） |
| exported_at | 导出时间（每次下载生成） |
| system_prompt | 系统提示词正文 |
| model_config | 模型参数：provider / model / temperature / max_tokens / top_p |
| examples | 示例 |
| install_guide | 各平台导入说明（Coze / Dify / Claude / 自定义框架） |
