处理知识冲突的人工裁决请求。展示冲突详情，支持用户选择保留策略（新覆旧、保留旧、合并、标记待定）。
Install with the open skills CLI (global, non-interactive — available in every Claude Code session):
npx skills add LeoYeAI/openclaw-master-skills --skill "conflict-resolve" -g -a claude-code -yOr manually — clone and copy the skill directory (SKILL.md + companion files):
git clone --depth 1 https://github.com/LeoYeAI/openclaw-master-skills /tmp/openclaw-master-skills && cp -r /tmp/openclaw-master-skills/skills/kivo/skill/resolve ~/.claude/skills/conflict-resolvePart of the kivo skill collection — installing the parent includes this skill.
This skill is a directory: SKILL.md is the entry point; the files below ship with it.
---
name: conflict-resolve
description: "处理知识冲突的人工裁决请求。展示冲突详情，支持用户选择保留策略（新覆旧、保留旧、合并、标记待定）。"
---
# ConflictResolveSkill — 冲突裁决
处理知识库中的冲突条目，支持人工裁决和自动解决策略。
## 触发词
知识冲突、矛盾了、哪个是对的、这两条知识矛盾了、用新的、保留旧的、帮我决定哪个对、resolve conflict、conflict、which one is correct
## 使用方式
```bash
# 列出待裁决冲突
tsx scripts/resolve.ts --list
# 裁决指定冲突（保留新条目）
tsx scripts/resolve.ts --id <conflict-id> --verdict keep-incoming
# 裁决指定冲突（保留旧条目）
tsx scripts/resolve.ts --id <conflict-id> --verdict keep-existing
# 合并两条
tsx scripts/resolve.ts --id <conflict-id> --verdict merge
```
## 核心路径
`src/conflict/conflict-resolver.ts` → `src/conflict/conflict-record.ts`
Use when facing 2+ independent tasks that can be worked on without shared state or sequential dependencies
Use when you have a written implementation plan to execute in a separate session with review checkpoints
Use when executing implementation plans with independent tasks in the current session