← All skills

conflict-resolve

95 / 100 · Low risk

Fine to try. Some of what it can do is expected: a coding skill usually runs build and test commands.

By LeoYeAI/agent-master-skills (GitHub) · coding · 2,186 stars · scanned at commit 8f88f9a

处理知识冲突的人工裁决请求。展示冲突详情，支持用户选择保留策略（新覆旧、保留旧、合并、标记待定）。

Works with any agent that supports SKILL.md skills.

What this skill can do

Install

Paste this into your terminal. It downloads exactly the version we scanned, not whatever is newest.

if [ -e ~/.agents/skills/'conflict-resolve' ] || [ -L ~/.agents/skills/'conflict-resolve' ]; then echo 'A skill folder named conflict-resolve already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/LeoYeAI/agent-master-skills' "$d" && git -C "$d" checkout --quiet '8f88f9a0dd5a1075d4f0c7626f9d960844d57575' -- 'skills/kivo/skill/resolve' && mkdir -p ~/.agents/skills && cp -R "$d"/'skills/kivo/skill/resolve' ~/.agents/skills/'conflict-resolve' && rm -rf "$d"; fi

Codex reads ~/.agents/skills directly. For Claude Code, Cursor, Copilot, Gemini CLI, Antigravity or OpenCode, also link it. For Claude Code: ln -s ~/.agents/skills/'conflict-resolve' ~/.claude/skills/'conflict-resolve' (other agents: ~/.cursor/skills, ~/.copilot/skills, ~/.gemini/skills, ~/.gemini/config/skills, ~/.config/opencode/skills). Or install through the finder skill, which does both.

Badge for your README

The badge for LeoYeAI/agent-master-skills shows the score of its lowest-scoring skill.

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/LeoYeAI/agent-master-skills.svg)](https://zalavijaysinh.github.io/skilltrust/repos/LeoYeAI/agent-master-skills/)

Score history