fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Install / Use
npx skills add michael-denyer/pstack-claude --skill fix-merge-conflictsInstalls into whichever agent you are using.
SKILL.md
Installable skill definition
Quality Score
Category
AutomationSupported Platforms
Our assessment of fix-merge-conflicts
fix-merge-conflicts scores 81/100 on our quality scale, 2436th of 2,846 Automation skills we index.
We have not analysed the SKILL.md file itself yet, so the content part of this score is an estimate until our crawler reaches it.
It has 557 GitHub stars, a meaningful sign that others use it.
Maintenance, license and trust
- The repository was last updated 10 days ago, so fix-merge-conflicts is actively maintained.
- It is released under the MIT license, a permissive license that allows use, modification and commercial use with attribution.
- Its trust signals score 100/100, with no cautions. These come from repository metadata, not a code audit — read the skill file before letting an agent act on it.
fix-merge-conflicts compared with similar skills
All 4 of these similar skills score higher than fix-merge-conflicts; compare them before choosing.
| Skill | Score | Stars | Updated | Format |
|---|---|---|---|---|
| fix-merge-conflicts (this skill)by michael-denyer | 81 | 557 | 10d ago | SKILL.md |
| Agent-Reachby Panniantong | 100 | 89.8k | 18d ago | CLAUDE.md |
| Scraplingby D4Vinci | 100 | 85.4k | today | MCP Server |
| rufloby ruvnet | 100 | 73.8k | today | MCP Server |
| algorithmic-artby anthropics | 100 | 177.9k | 11d ago | SKILL.md |
Frequently asked questions
- How do I install fix-merge-conflicts?
- Run
npx skills add michael-denyer/pstack-claude --skill fix-merge-conflicts. The install tabs above show the steps for each supported agent. - Which AI agents does fix-merge-conflicts work with?
- It is written for Universal, as a SKILL.md file. Other agents that read the same format can often use it too.
- Is fix-merge-conflicts safe to use?
- It is MIT-licensed and scores 100/100 on trust signals. Skills are instructions an agent will follow, so read the file before installing it and do not approve commands you do not understand.
- Is fix-merge-conflicts still maintained?
- The repository was last updated 10 days ago, so fix-merge-conflicts is actively maintained.
Related Skills
Agent-Reach
89.8kGive your AI agent eyes to see the entire internet. Read & search Twitter, Reddit, YouTube, GitHub, Bilibili, XiaoHongShu — one CLI, zero API fees.
Scrapling
85.4k🕷️ An adaptive Web Scraping framework that handles everything from a single request to a full-scale crawl! Don't be shy, join here: https://discord.gg/EMgGbDceNQ and follow here for daily tips and tricks: https://x.com/Scrapling_dev
ruflo
73.8k🌊 The original agent harness. Deploy intelligent multi-player swarms, coordinate autonomous workflows, and build conversational AI systems. Features adaptive memory, self-learning intelligence, federation, vector RAG integration, and native Claude Code / Codex / Hermes and many more Integrated
algorithmic-art
177.9kCreating algorithmic art using p5.js with seeded randomness and interactive parameter exploration. Use this when users request creating art using code, generative art, algorithmic art, flow fields, or particle systems.
Languages
Trust signals
From repository metadata: license, adoption, age and documentation. Not a code audit — see the Safety scan above for what the skill file itself contains.