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

Run npx skillmds@latest add j5ik2o/j5ik2o-gh-pr-resolve-conflicts in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.

Is J5ik2o Gh Pr Resolve Conflicts safe to use?

This skill has not completed SkillMD's automated safety review yet. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with J5ik2o Gh Pr Resolve Conflicts?

This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.

Is J5ik2o Gh Pr Resolve Conflicts free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published J5ik2o Gh Pr Resolve Conflicts?

j5ik2o (@j5ik2o) published this skill. Their other Agent Skills are listed on their SkillMD profile.

J5ik2o Gh Pr Resolve Conflicts by j5ik2o

Name: J5ik2o Gh Pr Resolve Conflicts
Author: j5ik2o

J5ik2o Gh Pr Resolve Conflicts

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.

j5ik2o Updated Sep 17, 2026

File contents

GitHub PR Resolve Conflicts

Trigger

The current PR branch has unresolved merge conflicts after attempting to integrate its base branch and needs a reliable path back to a buildable state.

Workflow

Confirm a merge or rebase conflict is in progress, then detect all conflicting files from git status and conflict markers.
Resolve each conflict with minimal, correctness-first edits.
Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
Regenerate lockfiles with package manager tools instead of hand-editing.
Run compile, lint, and relevant tests.
Verify that no unmerged paths or conflict markers remain.
Stage resolved files and summarize key decisions.

Guardrails

Keep changes minimal and readable.
Do not leave conflict markers in any file.
Avoid broad refactors while resolving conflicts.
Do not commit, push, or tag during conflict resolution; the calling workflow owns remote mutations.

Output

Files resolved
Files staged
Notable resolution choices
Build/test outcome

Frequently asked questions