Fix Merge Conflicts
Fix Merge Conflicts is an agent skill (a SKILL.md file) from michael-denyer/pstack-claude. Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution. It works with Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot and OpenCode and has 4,368 GitHub stars across a repository of 2 listed skills.
Data as of from the GitHub API; description from the skill's SKILL.md. Report an error
- Multi-skill repo
- Plugin marketplace
- Testing & QA
- Active
Add this skill
Claude
This repository is a Claude Code plugin marketplace. In Claude Code:
/plugin marketplace add michael-denyer/pstack-claude
/plugin install pstack@pstack-claudeIn the Claude apps, zip the fix-merge-conflicts folder and upload it under Customize > Skills > + > Upload a skill (code execution must be on).
ChatGPT / Codex
Codex reads skills from .agents/skills/ in a repo or ~/.agents/skills/ for every project:
git clone --depth 1 https://github.com/michael-denyer/pstack-claude.git
cp -r pstack-claude/plugins/pstack/skills/fix-merge-conflicts .agents/skills/fix-merge-conflicts # repo; ~/.agents/skills for all projectsStandalone skills also load in the ChatGPT desktop app.
Cursor
Cursor loads skills from .cursor/skills/ (or ~/.cursor/skills/) and also reads .claude/skills/:
git clone --depth 1 https://github.com/michael-denyer/pstack-claude.git
cp -r pstack-claude/plugins/pstack/skills/fix-merge-conflicts .cursor/skills/fix-merge-conflicts # project; ~/.cursor/skills for all projectsSource (checked Oct 7, 2026): code.claude.com/docs/en/skills (opens in a new tab), code.claude.com/docs/en/plugin-marketplaces (opens in a new tab), support.claude.com/en/articles/12512180-using-skills-in-claude (opens in a new tab), learn.chatgpt.com/docs/build-skills (opens in a new tab), cursor.com/docs/context/skills (opens in a new tab)
What this skill does
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
More skills in michael-denyer/pstack-claude
2 skills are listed from this repository.
Similar skills
More testing & qa skills
API Fuzzing Bug Bounty
zebbern/claude-code-guide
This skill should be used when the user asks to "test API security", "fuzz APIs", "find IDOR vulnerabilities", "test REST API", "test GraphQL", "API penetration testing", "bug bounty API testing"…
Maintained · last commit Nov 14, 2026
Testing & QAPythonObserval Ops
AgenticResourceRegistry/AgenticResourceRegistry
Inspects Observal traces, sessions, rankings, feedback, telemetry health, logs, and Agent insight reports.
Active · last commit Nov 14, 2026
Testing & QAPythonMarginaleffects
brycewang-stanford/Auto-Empirical-Research-Skills
Manual for the marginaleffects R and Python package, and guide to the book "Model to Meaning".
Active · last commit Nov 9, 2026
Testing & QAStataBenchmark Checklist
backnotprop/pstack
Vet a perf measurement (limiter, tuning, limits, errors, repeatability, relevance, and whether the work happened) before you report or act on it.
Maintained · last commit Nov 15, 2026
Testing & QATypeScriptMirrord Chaos
metalbear-co/mirrord
Help users chaos test their app with mirrord: inject artificial latency or connection errors into a mirrord session's outgoing traffic via per-session chaos rules managed with the mirrord chaos CLI.
Active · last commit Nov 15, 2026
OfficialTesting & QARustMeta Tags Optimizer
nowork-studio/notfair-plugin
Optimize title tags, meta descriptions, Open Graph, and Twitter cards for maximum click-through rate.
Maintained · last commit Nov 13, 2026
Testing & QA
How do I install the Fix Merge Conflicts skill?
In Claude Code, run /plugin marketplace add michael-denyer/pstack-claude and then /plugin install pstack@pstack-claude. For Codex or Cursor, copy the fix-merge-conflicts folder into .agents/skills/ or .cursor/skills/.
Is the Fix Merge Conflicts skill free?
Yes. The repository is open source under the MIT license.
Is Fix Merge Conflicts maintained?
The repository's most recent commit was on Nov 13, 2026. Its latest release is v0.9.138. appsgit only lists skills from repositories with a commit in the last six months.