merge-conflict
Resolve a merge conflict
Install / Use
npx skills add specstoryai/getspecstoryInstalls into whichever agent you are using.
Claude Commands
Claude Code slash commands
Quality Score
Category
Development & EngineeringSupported Platforms
Our assessment of merge-conflict
merge-conflict scores 50/100 on our quality scale, 4018th of 4,358 Development & Engineering skills we index.
Its Claude Commands is 715 bytes long, lightly structured (2 headings) and no code examples: fairly brief, so expect to fill in details yourself.
With 1,342 GitHub stars, it is one of the more widely adopted skills in the catalogue.
Maintenance, license and trust
- The repository was last updated 3 days ago, so merge-conflict is actively maintained.
- It is released under the Apache-2.0 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.
Safety scan
No issues foundOur scan of the whole file found no instruction hijacking, hidden characters, credential access, data exfiltration or destructive commands.
Automated pattern scan on 2026-10-01. It catches known dangerous patterns, not every risk — read a skill before letting an agent act on it.
merge-conflict compared with similar skills
All 4 of these similar skills score higher than merge-conflict; compare them before choosing.
| Skill | Score | Stars | Updated | Format |
|---|---|---|---|---|
| merge-conflict (this skill)by specstoryai | 50 | 1.3k | 3d ago | Claude Commands |
| claude-memby thedotmack | 100 | 95.1k | today | CLAUDE.md |
| Agent-Reachby Panniantong | 100 | 87.2k | 16d ago | CLAUDE.md |
| Understand-Anythingby Egonex-AI | 100 | 84.9k | 3d ago | CLAUDE.md |
| headroomby headroomlabs-ai | 100 | 74.2k | today | CLAUDE.md |
Frequently asked questions
- How do I install merge-conflict?
- Run
npx skills add specstoryai/getspecstory. The install tabs above show the steps for each supported agent. - Which AI agents does merge-conflict work with?
- It is written for Claude Code, as a Claude Commands file. Other agents that read the same format can often use it too.
- Is merge-conflict safe to use?
- Our scan of the whole file found no instruction hijacking, hidden characters, credential access, data exfiltration or destructive commands. It is Apache-2.0-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 merge-conflict still maintained?
- The repository was last updated 3 days ago, so merge-conflict is actively maintained.
Skill content
View source on GitHuballowed-tools: Bash(git status:), Bash(git diff:), Bash(grep:), Bash(awk:), Bash(sed:*) description: Resolve a merge conflict
Context
- Current git status: !
git status - Current git diff: !
git diff
Your task
Examine the current merge conflict using git commands.
Review each issue conflict by conflict and explain what caused each conflict. Explain what each side of the conflict was attempting to accomplish with their change.
Importantly, make a suggestion for the best resolution for each conflict, but only resolve them in discussion with me.
Use file names and line numbers to reference the changes, but also sequentially number every observation so we can easily reference them.
Related Skills
claude-mem
95.1kPersistent Context Across Sessions for Every Agent – Captures everything your agent does during sessions, compresses it with AI, and injects relevant context back into future sessions. Works with Claude Code, OpenClaw, Codex, Gemini, Hermes, Copilot, OpenCode + More
Agent-Reach
87.2kGive your AI agent eyes to see the entire internet. Read & search Twitter, Reddit, YouTube, GitHub, Bilibili, XiaoHongShu — one CLI, zero API fees.
Understand-Anything
84.9kGraphs 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, Copilot, Gemini CLI, and more.
headroom
74.2kCompress tool outputs, logs, files, and RAG chunks before they reach the LLM. 20% fewer tokens for coding agents, 60-95% fewer tokens for JSON, same answers. Library, proxy, MCP server.
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.