Enterprise DNAEnterprise DNA

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

Not reviewed yet

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.

How we review records

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
Checked GitHub
GitHub forks
397
Checked GitHub
GitHub stars
4,306
Checked GitHub
Days to a first reply on issues
0.1
Checked GitHub
Open issues
4
Checked GitHub
Releases in the last 90 days
95
Checked GitHub

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

GitHub stars

3,712 to 4,306

stars. 1 Nov 2026 to 14 Nov 2026, 3 readings.

Source: GitHub. Checked .

Health and security

Is fix-merge-conflicts looked after, and what do its setup files show

Health score

81 out of 100

Does someone look after this repository? It does not say the code is good or safe. Worked out from GitHub signals checked . How it is worked out

PartPointsWhat we saw
Recent activity30 of 30Last push 0 days ago
Releases15 of 1595 releases in 90 days
Issue replies20 of 20First reply in 0.1 days (median)
Maintainer0 of 15Owned by a single user
Official sourceNot countedMCP servers only

Security check static checks

100 out of 100

Reads what is published about the server: package advisories, licence, secrets in the documented setup and tool permissions. Nothing is installed or run, so this is not a security assessment. Checked by edna-skill-static-v1 main@356c6e0f978d. What it checks

  • 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

    Checked · Days since the last commit, GitHub forks, GitHub stars, Days to a first reply on issues, Open issues, Releases in the last 90 days

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.

Pairs with9 entries
Free 27-page guide

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.

No spam. Unsubscribe any time.