← All skills

j5ik2o-gh-pr-resolve-conflicts

100 / 100 · Low risk

Fine to try.

By j5ik2o/ai-tools (GitHub) · coding · 28 stars · scanned at commit 249f452

Resolve unresolved GitHub PR merge conflicts non-interactively after integrating the latest base branch, validate the build and relevant tests, and stage the resolution. Use when git reports unmerged paths or conflict markers while preparing a PR. Do not use when the PR is already mergeable.

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

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

Score history