Skills
fix-merge-conflicts
by michael-denyer
Antigravity, Claude Code, Codex, Copilot, Gemini, Muse, OpenCode, Pi, and Prime Agent versions of Poteto's pstack.
Our verdict
We have not reviewed fix-merge-conflicts yet
No one at Enterprise DNA has checked this listing against its sources. The description comes from public listings gathered automatically. Any fact below shows where it came from and when it was last checked.
From the listing
About fix-merge-conflicts
Antigravity, Claude Code, Codex, Copilot, Gemini, Muse, OpenCode, Pi, and Prime Agent versions of Poteto's pstack. Rigorous agent workflows with Cursor primitives translated for other harnesses.
Best for
Developers using AI coding agents who need a consistent, guided approach to resolving merge conflicts.
Use cases
- Resolving Git merge conflicts in a systematic, agent-guided manner
- Consistently applying conflict-resolution workflows across multiple AI coding tools
- Standardizing conflict handling within agent-based development pipelines
Notes
4,171 stars on GitHub. Last updated 2026-11-09. Licensed MIT.
Indexed from github-skill-repos. Verified against the live GitHub repo.
Pros
- Works across many popular AI coding agents
- Provides structured, rigorous conflict resolution workflows
- Based on proven Cursor primitives, adapted for other tools
Cons
- Primarily focused on a niche skill, not a general-purpose tool
- Requires familiarity with the specific agent environment to use effectively
- May not handle complex, non-standard conflict scenarios beyond its predefined workflows
Key facts
What we have checked
- Days since the last commit
- 0
- GitHub forks
- 397
- GitHub stars
- 4,306
- Days to a first reply on issues
- 0.1
- Open issues
- 4
- Releases in the last 90 days
- 95
Each value shows when we last confirmed it and where it came from. Values we have not confirmed are left out, never guessed.
Stars and usage
How fix-merge-conflicts is growing
3,712 to 4,306
Health and security
Is fix-merge-conflicts looked after, and what do its setup files show
Health score
81 out of 100
| Part | Points | What we saw |
|---|---|---|
| Recent activity | 30 of 30 | Last push 0 days ago |
| Releases | 15 of 15 | 95 releases in 90 days |
| Issue replies | 20 of 20 | First reply in 0.1 days (median) |
| Maintainer | 0 of 15 | Owned by a single user |
| Official source | Not counted | MCP servers only |
Security check static checks
100 out of 100
- Note No dependency list or install command was found in the skill, so there were no packages to look up on OSV.
Sources
Where this comes from
- GitHubRegistry
A source shows what was published when we checked it. It does not certify security, performance or a working installation. Read our method.
Changelog
What changed
No changes recorded yet. Releases, price changes and deprecations appear here, with their dates, once we track them for this record.
Pairs with
Other entries in the index that connect to this one. Click through to see the chain.
GIT
sanjeed5
Curated list of awesome Cursor Rules .mdc files
git-workflow-and-versioning
addyosmani
Production-grade engineering skills for AI coding agents.
understand-diff
Egonex-AI
Graphs that teach > graphs that impress. Turn any code into an interactive knowledge graph you can explore, search, and ask questions about. Works with Claude Code, Codex, Cursor,
Codex CLI
openai
Lightweight coding agent that runs in your terminal
Gemini CLI
google-gemini
An open-source AI agent that brings the power of Gemini directly into your terminal.
OpenCode
anomalyco
The open source coding agent.
git-master
code-yeongyu
OmO: Just type "mass ulw" keyword with your prompt. Now you are the master of graph engineering.
finishing-a-development-branch
obra
An agentic skills framework & software development methodology that works.
GIT
sanjeed5
Curated list of awesome Cursor Rules .mdc files
Gitflow
PatrickJS
📄 Configuration files that enhance Cursor AI editor experience with custom rules and behaviors
github-repo-management
infinition
Your personal AI hive. One Rust binary, fully local, genuinely yours.
git-master
code-yeongyu
OmO: Just type "mass ulw" keyword with your prompt. Now you are the master of graph engineering.
git-workflow-and-versioning
addyosmani
Production-grade engineering skills for AI coding agents.
lcx-contribute-bug-fix
code-yeongyu
OmO: Just type "mass ulw" keyword with your prompt. Now you are the master of graph engineering.
understand-diff
Egonex-AI
Graphs that teach > graphs that impress. Turn any code into an interactive knowledge graph you can explore, search, and ask questions about. Works with Claude Code, Codex, Cursor,
Get the free Developer’s Field Guide
A 27-page field guide to the AI coding workflow with Claude. Claude Code, MCP servers, the prompt patterns that work, and what to delegate. Free.
Enter your work email. We send it straight over, plus a few short notes worth knowing. Unsubscribe any time.