wiki-conflict
95 / 100 · Low risk
Fine to try.
Resolve `<path>.proposed` sidecar conflicts. The kit writes a sidecar when it tried to update a file the user had already edited — it never clobbers. This skill walks through reconciling the on-disk version with the proposed update, then commits the merged result through `wiki resolve` so the journal regains a clean baseline. Use whenever a `.proposed` sidecar appears, or whenever `wiki doctor` reports pending proposals.
What this skill can do
Runs commands on your computer
Install
Paste this into your terminal. It downloads exactly the version we scanned, not whatever is newest.
if [ -e ~/.agents/skills/'wiki-conflict' ] || [ -L ~/.agents/skills/'wiki-conflict' ]; then echo 'A skill folder named wiki-conflict already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/eugenelim/llm-wiki-kit' "$d" && git -C "$d" checkout --quiet '5548f76f4998708daa2ac452f2874579df3943b5' -- 'core/files/skills/wiki-conflict' && mkdir -p ~/.agents/skills && cp -R "$d"/'core/files/skills/wiki-conflict' ~/.agents/skills/'wiki-conflict' && 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/'wiki-conflict' ~/.claude/skills/'wiki-conflict' (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
[](https://zalavijaysinh.github.io/skilltrust/repos/eugenelim/llm-wiki-kit/)
Score history
| Date | Version | Score |
|---|---|---|
| 2026-11-10 | 5548f76 | 95 |
Also found in
- eugenelim/llm-wiki-kit/docs/guides/how-to/_examples/conflict-pending/skills/wiki-conflict
- eugenelim/llm-wiki-kit/starters/family/skills/wiki-conflict
- eugenelim/llm-wiki-kit/starters/work-os/skills/wiki-conflict