← All skills

resolve-conflict

100 / 100 · Low risk

Fine to try.

By ai-driven-dev/framework (GitHub) · coding · 554 stars · scanned at commit 6f70b65

Resolves deterministic Git conflicts or approved choices. Use when the user wants to resolve a merge, rebase, or cherry-pick conflict. Not for deciding between competing implementations or committing changes.

Works with any agent that supports SKILL.md skills.

What this skill can do

We found nothing in the files we read that matches our rules. That does not prove the skill is safe: see the limits of static scanning.

Install

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

if [ -e ~/.agents/skills/'resolve-conflict' ] || [ -L ~/.agents/skills/'resolve-conflict' ]; then echo 'A skill folder named resolve-conflict already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/ai-driven-dev/framework' "$d" && git -C "$d" checkout --quiet '6f70b656faeeacb9ba96e51a6ab1e79ff830803b' -- 'plugins/aidd-vcs/skills/05-resolve-conflict' && mkdir -p ~/.agents/skills && cp -R "$d"/'plugins/aidd-vcs/skills/05-resolve-conflict' ~/.agents/skills/'resolve-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/'resolve-conflict' ~/.claude/skills/'resolve-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

The badge for ai-driven-dev/framework shows the score of its lowest-scoring skill.

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/ai-driven-dev/framework.svg)](https://zalavijaysinh.github.io/skilltrust/repos/ai-driven-dev/framework/)

Score history