J5ik2o Gh Pr Resolve Conflicts

Q: What is a Claude Code skill and how does the J5ik2o Gh Pr Resolve Conflicts skill fit in?

A Claude Code skill is a SKILL.md file that lives under ~/.claude/skills/<name>/ and tells the Claude Code CLI agent how to perform a specific task (instructions, prompts, allowed tools). Skills are auto-discovered at session start. J5ik2o Gh Pr Resolve Conflicts is one of 67,000+ skills indexed in the open ClaudSkills catalog, classified under the General category. Learn more at https://claudskills.com/learn/what-is-skill-md/.

Category: General · Sub-category: general-misc · Last updated: 2026-07-16

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.

Security AStatic scan found no risk patternsHow grading works ›

What this skill does

J5ik2o Gh Pr Resolve Conflicts is a community-contributed Claude Code skill in the general-misc sub-category. It ships as a SKILL.md file that Claude Code auto-discovers under ~/.claude/skills/j5ik2o-gh-pr-resolve-conflicts/ and loads when your prompt matches the skill's trigger.

When to invoke it: Use when git reports unmerged paths or conflict markers while preparing a PR. Do not use when the PR is already mergeable.

Who uses this skill

The J5ik2o Gh Pr Resolve Conflicts Claude Code skill is built for Claude Code users and developers across all disciplines looking for general-purpose AI assistance. It's part of ClaudSkills (also referred to as Claude Skills or Claude Code Skills) — the open community-curated registry of 196,000+ SKILL.md files for Anthropic's Claude Code agent and the wider Claude ecosystem (Claude API, Claude Agent SDK).

How to install

Free

Manual install (2 steps)

mkdir -p ~/.claude/skills/j5ik2o-gh-pr-resolve-conflicts
curl -L https://claudskills.com/skills/j5ik2o-gh-pr-resolve-conflicts/SKILL.md \
  -o ~/.claude/skills/j5ik2o-gh-pr-resolve-conflicts/SKILL.md

Or just download SKILL.md directly and drop it into ~/.claude/skills/j5ik2o-gh-pr-resolve-conflicts/. Claude Code auto-discovers it on next session.

Skills live at ~/.claude/skills/j5ik2o-gh-pr-resolve-conflicts/SKILL.md on macOS/Linux, or %USERPROFILE%\.claude\skills\j5ik2o-gh-pr-resolve-conflicts\SKILL.md on Windows. See the full install guide for step-by-step instructions.

📱 Install from your phone or desktop Telegram

Open @claudskills_bot on Telegram, tap Open Desktop App, and the desktop app installs this skill for you. Or share the bot link with a colleague — they get the same one-tap install. Learn more →

Pro

One-click install via the desktop app

The ClaudSkills desktop app installs any skill directly into ~/.claude/skills/ with one click — no terminal required. Pro starts at $9/mo or $149 lifetime.

Pro

For the full experience including quality scoring and one-click install features for each skill — upgrade to Pro.

See pricing → Download desktop app

Frequently asked questions

How do I install the J5ik2o Gh Pr Resolve Conflicts Claude Code skill?

Install via the ClaudSkills desktop app (one click) or copy SKILL.md from the source repository to ~/.claude/skills/j5ik2o-gh-pr-resolve-conflicts/SKILL.md and restart Claude Code. Both flows are detailed at claudskills.com/install/.

What does the J5ik2o Gh Pr Resolve Conflicts skill do?

Is this skill free to install?

Yes. ClaudSkills is an open registry — every skill keeps its source repository's license, and manual install via copy is free. ClaudSkills Pro ($9/mo, $79/yr, or $149 one-time) adds one-click install via the desktop app and a multi-signal Quality Score.

When should I use the J5ik2o Gh Pr Resolve Conflicts skill?

Use J5ik2o Gh Pr Resolve Conflicts when your Claude Code task falls under the General category — specifically in the general misc area. Claude Code auto-discovers installed skills and invokes the right one based on the task description, so you can also ask Claude directly (e.g. "use J5ik2o Gh Pr Resolve Conflicts" or describe the task and let Claude pick). Browse related skills at /category/general/.

What is a Claude Code skill and how does the J5ik2o Gh Pr Resolve Conflicts skill fit in?

A Claude Code skill is a SKILL.md file that lives under ~/.claude/skills/<name>/ and tells the Claude Code CLI agent how to perform a specific task (instructions, prompts, allowed tools). Skills are auto-discovered at session start. J5ik2o Gh Pr Resolve Conflicts is one of 67,000+ skills indexed in the open ClaudSkills catalog, classified under the General category. Learn more at /learn/what-is-a-claude-skill/.

Attribution & license

Source: https://github.com/j5ik2o/ai-tools/blob/7c683d7c11072814623f5599f0a219ea0eeed8a4/plugins/github/skills/j5ik2o-gh-pr-resolve-conflicts/SKILL.md
License: Apache-2.0
Author: j5ik2o

Cite this skill

If you reference this skill in a blog post, paper, or documentation, you can cite it as:

APA

j5ik2o. (2026). J5ik2o Gh Pr Resolve Conflicts [Claude Code skill]. ClaudSkills. https://claudskills.com/skills/j5ik2o-gh-pr-resolve-conflicts/

BibTeX

@misc{j5ik2o-gh-pr-resolve-conflicts-2026,
  author    = {j5ik2o},
  title     = {J5ik2o Gh Pr Resolve Conflicts [Claude Code skill]},
  year      = {2026},
  publisher = {ClaudSkills},
  url       = {https://claudskills.com/skills/j5ik2o-gh-pr-resolve-conflicts/}
}

Embed this skill

Promote, attribute, or link this skill from your own README, blog post, or documentation. All three snippets are free to use — no sign-up, no API key. More distribution surfaces →

Badge

[![ClaudSkills](https://claudskills.com/badge/j5ik2o-gh-pr-resolve-conflicts.svg)](https://claudskills.com/skills/j5ik2o-gh-pr-resolve-conflicts/?utm_source=badge&utm_medium=readme&utm_campaign=skill_badge)

Security scan

Grade A · scanned 2026-09-28 — free static scan against the OWASP Agentic Skills Top 10.

No risk patterns were found in any of the ten OWASP-aligned categories. How grading works ›

✓ Prompt injection
✓ Data exfiltration
✓ Supply chain
✓ Reverse shell
✓ Credentials
✓ Execution
✓ Filesystem
✓ Persistence
✓ Obfuscation
✓ Network

Show this grade on your repo (click to copy):

[![Security: A](https://img.shields.io/badge/Security-A-2e7d32)](https://claudskills.com/skills/j5ik2o-gh-pr-resolve-conflicts/#security)

More General skills

Browse all General skills in the ClaudSkills registry, or explore these other picks from the same category:

Browse all General skills → Top 100 skills

Part of ClaudSkills — the open registry for Claude Skills & Claude Code Skills. · What's New · Install guide · About · llms.txt

Part of Acreator Store — Adam Lankamer's AI tools: PerfectStudio · Ucaption · UTagger · AutoXPoster · TestYourSkills · AutomationFlows · Au Naturel · Telegram @acreatorstore