GenPark Git Semantic Cherry-Pick Conflict Resolver
LocalAbout GenPark Git Semantic Cherry-Pick Conflict Resolver
A Python MCP server for resolving Git cherry-pick and rebase conflicts through three-way AST hunk alignment and non-overlapping block handling. It is intended for workflows that need semantic patch conflict resolution, and uses only the Python 3 standard library.
Key features
- 01Three-way AST hunk alignment
- 02Non-overlapping block conflict resolution
- 03Cherry-pick and rebase patch handling
- 04Python 3 standard-library implementation
Use cases
- 01Resolving conflicts in Git cherry-picks
- 02Handling conflicts in Git rebases
MCP support
Runs as an MCP server that can be added to Claude Desktop or Cursor configuration. Its stated purpose is resolving Git cherry-pick and rebase patch conflicts.
Configuration
Local server config is the same for every client. Copy it into your client’s MCP config file.
We haven’t collected a package or remote endpoint for this server. Follow the instructions in the project README.
Tools
Local servers expose tools only once running on your machine, and the maintainer has not provided a tool list.
Details
From the project READMEgenpark-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.
Comments
New to MCP?
From what the protocol is to installing your first server, these answers cover most first questions.
An open protocol that defines how AI applications connect to external tools and data in a uniform way. Clients talk to the model; MCP servers provide tools, resources and prompt templates. They exchange standard messages, so one server can be reused by many clients.