fix-merge-conflicts Skill
★ Stars are for the whole repo, not this skill
What it does
fix-merge-conflicts is 1 of 54 skills in the pstack-claude repo
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
- Connects Instruction files the AI reads; connects to nothing
- Account or key No key needed
- Category Coding
Use together with
MCP servers that connect the AI to services for the same work
Fallow
Codebase intelligence for TypeScript and JavaScript, exposed as structured MCP analysis tools.
Desktop Commander
MCP server for terminal commands, file operations, and process management
1 skills (instruction sets) by michael-denyer that an AI reads and follows · not an MCP server
How a Skill differs from MCP
MCP = the hands
Connects the AI to an outside service or data, such as reading Notion or creating an invoice. A program or server has to be running.
Skill = the manual
A text file that teaches the AI how to do a task. It connects to nothing.
Some overlap: a few Skills run scripts that call tools, and a few MCP servers only send knowledge. Start from the task you want done.
Works with
Claude CodeCodexCursorGemini CLIGitHub CopilotOpenCode
From the maker’s README and the folders in the repo
Install
Is it safe?
- Who made it
GitHub account michael-denyer (person), 4 years old
- Use and upkeep
★ 4,346 stars · code last changed Nov 13, 2026
- Any scripts?
No, plain text files the AI reads and follows
- Uses the internet?
No scripts, so it does not go online by itself
- Changes machine-wide settings?
Installing the maker’s way adds hooks that run without you asking: run every time a chat starts and adds 4 sub-agents · Installed as a plugin (/plugin) it will run every time a chat starts in every project
Checked automatically from the repo files at commit a12b047 (read only, nothing was run). Not a safety guarantee: read it and decide for yourself
First: which AI do you use?
Pick your app and this page shows only how to install it there
Option 1Upload to claude.ai (web and app)
Files are byte-for-byte the same as on GitHub at commit a12b047 · View on GitHub ↗
Plain text files, no programs
Once uploaded it runs on Claude’s systems, not on your computer. No need to unzip
Look inside before downloading
All 2 files · 2 KB
SKILL.md1 KBLICENSE1 KB
Download fix-merge-conflicts.zip
Open Skills on claude.ai and upload
+Create skillUpload a skillpick fix-merge-conflicts.zip
No Upload button? Turn on file creation first
SettingsCapabilitiesCode execution and file creation
Turn on Code execution and file creation first (newer menus: Create and edit files) · personal plans: Settings → Capabilities · Team/Enterprise: an admin turns it on under Organization settings → Plugins & skills · every plan, including Free
Upload once; it works in claude.ai and Claude Desktop, and in recent Claude Code signed in with a Claude account (not with an API key)
Cowork and cloud sessions use the skills turned on in your claude.ai account, not ~/.claude/skills on your computer (Claude Desktop scheduled tasks run locally and still load it)
Checked against official docs Nov 12, 2026 · Source: support.claude.com, support.claude.com, code.claude.com
Option 1Let Claude Code install it
Copy this sentence and paste it into a Claude Code chat
For one project, paste it into a chat that is open in that project’s folder · The AI always shows you the path before installing
The AI tells you what it will do first and asks your permission at every step
Restart Claude Code, then type /fix-merge-conflicts or ask for a matching task and Claude picks it up
Checked against official docs Nov 12, 2026 · Source: code.claude.com
For Terminal users
A Skill is instructions the AI will follow. Read the files before installing, and install only from makers you trust.
The maker’s recommended way
/plugin marketplace add michael-denyer/pstack-claude
/plugin install pstack@pstack-claudeCopied from the maker’s README; it downloads and runs the maker’s code
Open Terminal
Mac: press Command+Space and type Terminal · Windows: the command below does not work in PowerShell; use “Let AI install it” above instead
Copy the skill folder to ~/.claude/skills
This downloads the repo to a temporary folder and copies only the folders that contain a SKILL.md
git clone --depth 1 https://github.com/michael-denyer/pstack-claude.git /tmp/popnx-skill-michael-denyer-pstack-claude-fix-merge-conflicts-a12b047 && mkdir -p ~/.claude/skills && cp -R '/tmp/popnx-skill-michael-denyer-pstack-claude-fix-merge-conflicts-a12b047/plugins/pstack/skills/fix-merge-conflicts' ~/.claude/skills/fix-merge-conflictsRestart Claude Code, then type /fix-merge-conflicts or ask for a matching task and Claude picks it up
ChatGPT desktop app
The ChatGPT desktop app has Codex built in, and Codex reads skills from ~/.agents/skills
Option 1Let ChatGPT install it
Open Codex in the ChatGPT desktop app and paste this sentence into the chat
The AI always shows you the path before installing
The AI tells you what it will do first and asks your permission at every step
Option 2Put the folder there yourself
Put the fix-merge-conflicts folder at ~/.agents/skills/fix-merge-conflicts
~ is your home folder ($HOME)
Without Terminal: download the ZIP, unzip it and move the fix-merge-conflicts folder to ~/.agents/skills
Download fix-merge-conflicts.zip
For Terminal users
A Skill is instructions the AI will follow. Read the files before installing, and install only from makers you trust.
Open Terminal
Mac: press Command+Space and type Terminal · Windows: the command below does not work in PowerShell; use “Let AI install it” above instead
Copy the skill folder to ~/.agents/skills
This downloads the repo to a temporary folder and copies only the folders that contain a SKILL.md
git clone --depth 1 https://github.com/michael-denyer/pstack-claude.git /tmp/popnx-skill-michael-denyer-pstack-claude-fix-merge-conflicts-a12b047 && mkdir -p ~/.agents/skills && cp -R '/tmp/popnx-skill-michael-denyer-pstack-claude-fix-merge-conflicts-a12b047/plugins/pstack/skills/fix-merge-conflicts' ~/.agents/skills/fix-merge-conflicts
After installing
- ChatGPT desktop app: open Skills in the sidebar to see that the skill is there
- To use it: in ChatGPT type @ and pick the skill · in Codex CLI or the IDE extension run /skills or type $ and the skill name
- Codex picks up newly installed skills by itself; if one does not show up, restart Codex
Checked against official docs Nov 15, 2026 · Source: learn.chatgpt.com
ChatGPT on the web and mobile
Skills you install yourself do not work here; only skills that come with a plugin from the directory
To use this skill with ChatGPT, use the ChatGPT desktop app as above
Checked against official docs Nov 15, 2026 · Source: learn.chatgpt.com
Option 1Let Codex install it
Copy this sentence and paste it into a Codex chat · Works in Codex inside the ChatGPT desktop app, Codex CLI and the IDE extension
For one project, paste it into a chat that is open in that project’s folder · The AI always shows you the path before installing
The AI tells you what it will do first and asks your permission at every step
Codex picks up newly installed skills by itself; if one does not show up, restart Codex · To use it: in ChatGPT type @ and pick the skill · in Codex CLI or the IDE extension run /skills or type $ and the skill name
Checked against official docs Nov 15, 2026 · Source: learn.chatgpt.com
For Terminal users
A Skill is instructions the AI will follow. Read the files before installing, and install only from makers you trust.
Open Terminal
Mac: press Command+Space and type Terminal · Windows: the command below does not work in PowerShell; use “Let AI install it” above instead
Copy the skill folder to ~/.agents/skills
This downloads the repo to a temporary folder and copies only the folders that contain a SKILL.md
git clone --depth 1 https://github.com/michael-denyer/pstack-claude.git /tmp/popnx-skill-michael-denyer-pstack-claude-fix-merge-conflicts-a12b047 && mkdir -p ~/.agents/skills && cp -R '/tmp/popnx-skill-michael-denyer-pstack-claude-fix-merge-conflicts-a12b047/plugins/pstack/skills/fix-merge-conflicts' ~/.agents/skills/fix-merge-conflictsRestart Codex, then ask for a matching task; Codex lists the skill
Option 1Let Cursor install it
Copy this sentence and paste it into a Cursor chat
For one project, paste it into a chat that is open in that project’s folder · The AI always shows you the path before installing
The AI tells you what it will do first and asks your permission at every step
In Cursor’s Agent chat, type / and pick fix-merge-conflicts
Checked against official docs Nov 12, 2026 · Source: cursor.com
For Terminal users
A Skill is instructions the AI will follow. Read the files before installing, and install only from makers you trust.
Open Terminal
Mac: press Command+Space and type Terminal · Windows: the command below does not work in PowerShell; use “Let AI install it” above instead
Copy the skill folder to ~/.cursor/skills
This downloads the repo to a temporary folder and copies only the folders that contain a SKILL.md
git clone --depth 1 https://github.com/michael-denyer/pstack-claude.git /tmp/popnx-skill-michael-denyer-pstack-claude-fix-merge-conflicts-a12b047 && mkdir -p ~/.cursor/skills && cp -R '/tmp/popnx-skill-michael-denyer-pstack-claude-fix-merge-conflicts-a12b047/plugins/pstack/skills/fix-merge-conflicts' ~/.cursor/skills/fix-merge-conflictsIn Cursor’s Agent chat, type / and pick fix-merge-conflicts
Option 1Let the AI install it
For other apps that read skills. The sentence gives the paths for Claude Code, Codex and Cursor so the AI picks the one for your app · Copy this sentence into the app’s chat
For one project, paste it into a chat that is open in that project’s folder · The AI always shows you the path before installing
The AI tells you what it will do first and asks your permission at every step
Checked against official docs Nov 12, 2026 · Source: code.claude.com, learn.chatgpt.com, cursor.com
For Terminal users
Other apps that support Agent Skills (such as Gemini CLI or GitHub Copilot) use different folders. Check that app’s guide, then copy the folder with the SKILL.md there.
Skill folders checked against the official Claude Code, Codex and Cursor guides on Nov 11, 2026
✓ Commands checked Nov 16, 2026
Discussion
Ask, share a tip or report that it does not work. Sorted by what people marked helpful.
No posts yet. Be the first to ask or share.
Posts here are written by users, not the PopNx team.
From GitHub
- GitHub stars
- 4,346
Stars are for the whole repo, not this skill - Maker
- michael-denyer
- License
- MIT
- Last code change
- Nov 13, 2026
- SKILL.md files in the repo (including translated copies and templates)
- 1
- Topics
- agent-plugin, agent-skills, agentic-ai, anthropic, antigravity-skills, chatgpt, claude, claude-code, claude-code-skills, claude-plugin, claude-skills, code-review