跳至正文
OpenAgentSkill
浏览已开放 · 目录记录日期 2026-11-21 · 自动更新和账户服务暂时关闭。
其他技能

hk-merge-resolve

Resolve the conflicts of an in-progress merge, rebase or cherry-pick, then run the affected suite with the verify gate the entrypoint names. Triggers on: 'merge conflict', 'resolve conflicts', 'conflict markers', 'rebase conflict', or /hk-merge-resolve.

deepklarity · 已有静态检查记录

安装与使用

运行命令前先阅读来源与依赖说明。复制命令不会自动安装或执行。

npx skills add deepklarity/harness-kit --skill hk-merge-resolve

技能说明


name: hk-merge-resolve description: "Resolve the conflicts of an in-progress merge, rebase or cherry-pick, then run the affected suite with the verify gate the entrypoint names. Triggers on: 'merge conflict', 'resolve conflicts', 'conflict markers', 'rebase conflict', or /hk-merge-resolve." allowed-tools: Bash, Read, Edit, Grep, Glob, AskUserQuestion

This skill lives in docs/skills/git/hk-merge-resolve/. Read docs/skills/git/hk-merge-resolve/SKILL.md and follow it exactly.

Every supporting file it mentions (REFERENCE.md, templates, scripts/, examples) sits beside it in that directory. Wherever it says "this skill's directory" or uses a path relative to itself, resolve it against docs/skills/git/hk-merge-resolve/.