Koskamo

GenPark Git Semantic Cherry-Pick Conflict Resolver MCP

An MCP server that performs three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-pick and rebase patches. It is implemented entirely in Python 3 standard library with zero external dependencies, allowing agents to resolve code merge conflicts semantically.

Package and access

Local package with source-attributed installation metadata. Koskamo does not execute packages during review.

GenPark Git Semantic Cherry-Pick Conflict Resolver MCP logo, by GenParkCommunity listingLocal stdioSource reviewed; not executedPublished by GenPark
Vendor documentation

What you can do with it

  • Resolve Git cherry-pick conflicts using AST alignment
  • Handle rebase patch conflicts with non-overlapping blocks
  • Integrate semantic conflict resolution into agent workflows

Source and maintenance

Community listingRegistry 1.0.1
Maintenance checked

Packages and installation

Source-provided package data. Koskamo has not executed or live-probed this package.

https://github.com/Alpha-Park/genpark-git-semantic-cherry-pick-conflict-resolver-skill/releases/download/v1.0.1/genpark-git-semantic-cherry-pick-conflict-resolver-skill.mcpb

mcpbSHA-256 supplied
https://github.com/Alpha-Park/genpark-git-semantic-cherry-pick-conflict-resolver-skill/releases/download/v1.0.1/genpark-git-semantic-cherry-pick-conflict-resolver-skill.mcpb package definition
{
  "transport": "stdio",
  "fileSha256": "af26c656488ff53cfc89ddff9126f7261bcfa0210f831b356d9c8623448366a2",
  "identifier": "https://github.com/Alpha-Park/genpark-git-semantic-cherry-pick-conflict-resolver-skill/releases/download/v1.0.1/genpark-git-semantic-cherry-pick-conflict-resolver-skill.mcpb",
  "registryType": "mcpb"
}

Tools

Reported by the attributed source; not independently observed by Koskamo.

No tool definitions available.

Let your agent find its tools

Find servers like GenPark Git Semantic Cherry-Pick Conflict Resolver MCP from your agent. Add Koskamo once to search the index for endpoints, access requirements, and client setup. Public discovery needs no key.