← All skills

fix-merge-conflicts

80 / 100 · Low risk

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

By tamarillo-ai/theta (GitHub) · coding · 15 stars · scanned at commit 08c084f

Resolve all merge conflicts on the current branch non-interactively, validate the build, and commit. Use when the user says "fix merge conflicts", "resolve conflicts", or when git status shows conflicting files.

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/'fix-merge-conflicts' ] || [ -L ~/.agents/skills/'fix-merge-conflicts' ]; then echo 'A skill folder named fix-merge-conflicts already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/tamarillo-ai/theta' "$d" && git -C "$d" checkout --quiet '08c084f718b2b842cd53622ce0b1a1fb2888ccef' -- 'test/cast-fixtures/codex-cli/regression/5chan/.codex/skills/fix-merge-conflicts' && mkdir -p ~/.agents/skills && cp -R "$d"/'test/cast-fixtures/codex-cli/regression/5chan/.codex/skills/fix-merge-conflicts' ~/.agents/skills/'fix-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/'fix-merge-conflicts' ~/.claude/skills/'fix-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 tamarillo-ai/theta shows the score of its lowest-scoring skill.

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/tamarillo-ai/theta.svg)](https://zalavijaysinh.github.io/skilltrust/repos/tamarillo-ai/theta/)

Score history

Also found in

Identical copies of this skill exist at:

• tamarillo-ai/theta/test/cast-fixtures/codex-cli/regression/seedit/.codex/skills/fix-merge-conflicts