# Fix Merge Conflicts (agent skill)

> 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.

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.

## Key facts

| Fact | Value |
|---|---|
| Repository | https://github.com/michael-denyer/pstack-claude |
| Skill path | plugins/pstack/skills/fix-merge-conflicts/SKILL.md |
| Skill name | fix-merge-conflicts |
| GitHub stars | 4,368 |
| Installs on skills.sh | not listed |
| License | MIT |
| Skills in repo | 2 |
| Plugin marketplace | pstack-claude |
| Official | no |
| Works with | Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot, OpenCode |
| Category | Testing & QA |
| Last commit | Nov 13, 2026 |

## Add this skill

### Claude Code

```sh
/plugin marketplace add michael-denyer/pstack-claude
/plugin install pstack@pstack-claude
```

In the Claude apps, zip the skill folder and upload it under Customize > Skills > + > Upload a skill (code execution must be on).

### ChatGPT / Codex

```sh
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 projects
```

### Cursor

```sh
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 projects
```

Sources (checked 2026-10-07): https://code.claude.com/docs/en/skills, https://support.claude.com/en/articles/12512180-using-skills-in-claude, https://learn.chatgpt.com/docs/build-skills, https://cursor.com/docs/context/skills

---

Canonical page: https://appsgit.com/skills/michael-denyer-fix-merge-conflicts
Source: appsgit (https://appsgit.com), the app store for github. Data from the GitHub API, refreshed daily.
Machine access: JSON API https://appsgit.com/api/v1/apps (OpenAPI: https://appsgit.com/openapi.json), MCP server https://mcp.appsgit.com/mcp, full index https://appsgit.com/llms-full.txt.
