resolving-merge-conflicts
星标208,500
分支24,603
更新时间2026年7月13日 15:06
Use when you need to resolve an in-progress git merge/rebase conflict.
· 实时索引
安装
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
想先保存到本地？可下载 RuleHub 当前索引到的 GitHub 仓库压缩包。
下载 Zip文件资源管理器2 个文件
SKILL.mdreadonly
| name | resolving-merge-conflicts |
| description | Use when you need to resolve an in-progress git merge/rebase conflict.... |
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
When to use
Use this skill when the user needs help with tasks related to resolving merge conflicts.
Guidelines
- Follow repository conventions in
mattpocock/skills - Prefer minimal, focused changes
- Validate outputs before finishing