# GenPark Git Semantic Cherry-Pick Conflict Resolver

> GenPark Git Semantic Cherry-Pick Conflict Resolver is an open-source MCP server for developer tools. Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks. It runs locally on your machine and is started by your AI client.

- **Kind:** MCP server
- **Pricing:** Open source
- **Website:** https://genpark.ai/mcp
- **Repository:** https://github.com/alphaparkinc/genpark-git-semantic-cherry-pick-conflict-resolver-skill
- **MCP Registry name:** io.github.alphaparkinc/genpark-git-semantic-cherry-pick-conflict-resolver-skill
- **Categories:** developer tools
- **Listing updated:** 2026-11-13

## About

Three-way AST hunk alignment and non-overlapping block conflict resolution for Git cherry-picks

## Install

### Claude Code (Terminal)

```sh
claude mcp add genpark-git-semantic-cherry-pick-conflict-resolver-skill -- npx -y 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
```

### Claude Desktop (claude_desktop_config.json)

```json
{
  "mcpServers": {
    "genpark-git-semantic-cherry-pick-conflict-resolver-skill": {
      "command": "npx",
      "args": [
        "-y",
        "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"
      ]
    }
  }
}
```

### Cursor (~/.cursor/mcp.json)

```json
{
  "mcpServers": {
    "genpark-git-semantic-cherry-pick-conflict-resolver-skill": {
      "command": "npx",
      "args": [
        "-y",
        "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"
      ]
    }
  }
}
```

### VS Code (.vscode/mcp.json)

```json
{
  "servers": {
    "genpark-git-semantic-cherry-pick-conflict-resolver-skill": {
      "type": "stdio",
      "command": "npx",
      "args": [
        "-y",
        "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"
      ]
    }
  }
}
```

### Windsurf (~/.codeium/windsurf/mcp_config.json)

```json
{
  "mcpServers": {
    "genpark-git-semantic-cherry-pick-conflict-resolver-skill": {
      "command": "npx",
      "args": [
        "-y",
        "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"
      ]
    }
  }
}
```

### Other clients (your client's MCP settings (most use this shape))

```json
{
  "mcpServers": {
    "genpark-git-semantic-cherry-pick-conflict-resolver-skill": {
      "command": "npx",
      "args": [
        "-y",
        "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"
      ]
    }
  }
}
```

## FAQ

### Is GenPark Git Semantic Cherry-Pick Conflict Resolver free?

Yes. GenPark Git Semantic Cherry-Pick Conflict Resolver is open source, so you can use and self-host it for free.

### How do I add GenPark Git Semantic Cherry-Pick Conflict Resolver to Claude Code?

Run this command in your terminal: claude mcp add genpark-git-semantic-cherry-pick-conflict-resolver-skill -- npx -y 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

### What are the best alternatives to GenPark Git Semantic Cherry-Pick Conflict Resolver?

The closest alternatives to GenPark Git Semantic Cherry-Pick Conflict Resolver are REA, Codebase Memory, GitHub, Serena MCP: the IDE for your agent and XERJ.

## Alternatives

- [REA](https://ai-powered.com/mcp/rea): REA is an open-source MCP server for developer tools.
- [Codebase Memory](https://ai-powered.com/mcp/codebase-memory): Codebase Memory is an open-source MCP server for knowledge and memory.
- [GitHub](https://ai-powered.com/mcp/github-2): GitHub is an open-source MCP server for developer tools.
- [Serena MCP: the IDE for your agent](https://ai-powered.com/mcp/serena-mcp-the-ide-for-your-agent): Serena MCP: the IDE for your agent is an open-source MCP server for developer tools.
- [XERJ](https://ai-powered.com/mcp/xerj): XERJ is an open-source MCP server for knowledge and memory.
- [Ouroboros](https://ai-powered.com/mcp/ouroboros): Ouroboros is an open-source MCP server for developer tools.
- [Claude Code Ultimate Guide](https://ai-powered.com/mcp/claude-code-ultimate-guide): Claude Code Ultimate Guide is an open-source MCP server for ai models and llm tooling.
- [Concord MCP](https://ai-powered.com/mcp/concord-mcp): Concord MCP is a freemium MCP server for developer tools.

---
Source: https://ai-powered.com/mcp/genpark-git-semantic-cherry-pick-conflict-resolver
