GenPark Git Semantic Cherry-Pick Conflict Resolver
Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks
Install
Add this to your client's MCP configuration (Claude Desktop: claude_desktop_config.json; Cursor: .cursor/mcp.json; VS Code and others use the same "mcpServers" shape).
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.mcpbDocumentation
From the project's README on GitHub, refreshed weekly. Links open on GitHub.
genpark-git-semantic-cherry-pick-conflict-resolver-skill
Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-pick and rebase patches
Quick Installation & MCP Integration
Add to your Claude Desktop or Cursor configuration:
{
"mcpServers": {
"genpark-git-semantic-cherry-pick-conflict-resolver-skill": {
"command": "python",
"args": ["mcp_server.py"]
}
}
}Zero Dependencies
Implemented entirely in Python 3 standard library.
Frequently asked questions
What is GenPark Git Semantic Cherry-Pick Conflict Resolver?
Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks
How do I install GenPark Git Semantic Cherry-Pick Conflict Resolver?
Follow the installation steps in its documentation, shown on this page and in its repository.
Does GenPark Git Semantic Cherry-Pick Conflict Resolver need an API key?
Its registry entry lists no required key or secret. Some features may still need an account with the service it connects to.
Is GenPark Git Semantic Cherry-Pick Conflict Resolver open source?
Its code is public on GitHub, but the repository does not declare a standard license.
Who maintains GenPark Git Semantic Cherry-Pick Conflict Resolver?
It is published by alphaparkinc. AI.tn lists it but does not maintain or endorse it.
From the official MCP Registry. Listing is not an endorsement: review a server's code and permissions before giving it access to your data.