SkillTrust

← All skills

resolving-merge-conflicts

100 / 100 · Low risk

Fine to try.

By agross/dotfiles (GitHub) · coding · 61 stars · scanned at commit 6ffbdfd

Use when you need to resolve an in-progress git merge/rebase conflict.

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/'resolving-merge-conflicts' ] || [ -L ~/.agents/skills/'resolving-merge-conflicts' ]; then echo 'A skill folder named resolving-merge-conflicts already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/agross/dotfiles' "$d" && git -C "$d" checkout --quiet '6ffbdfd8ec3618ae7497f5e70f287462f51ca291' -- 'agents/agents/skills/resolving-merge-conflicts' && mkdir -p ~/.agents/skills && cp -R "$d"/'agents/agents/skills/resolving-merge-conflicts' ~/.agents/skills/'resolving-merge-conflicts' && 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/'resolving-merge-conflicts' ~/.claude/skills/'resolving-merge-conflicts' (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 agross/dotfiles shows the score of its lowest-scoring skill.

SkillTrust badge for agross/dotfiles

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/agross/dotfiles.svg)](https://zalavijaysinh.github.io/skilltrust/repos/agross/dotfiles/)

Score history

DateVersionScore
2026-11-136ffbdfd100
2026-11-0980b1d43100
2026-11-07072dc3c100

Also found in

Identical copies of this skill exist at: