Skip to content
MCP server

GenPark Git Semantic Cherry-Pick Conflict Resolver

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

Runs locallyStatus and history
Install
Pricing
Open source
Runs
Locally
Version
1.0.1
Listing updated
4 days ago

About GenPark Git Semantic Cherry-Pick Conflict Resolver

GenPark Git Semantic Cherry-Pick Conflict Resolver is an open-source MCP server for developer tools. It runs locally on your machine and is started by your AI client.

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

Install

Run in a 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

Add to claude_desktop_config.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"
      ]
    }
  }
}
Install in CursorOpens Cursor, which asks you to confirm. Or add it by hand:

Add to ~/.cursor/mcp.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"
      ]
    }
  }
}
Install in VS CodeOpens VS Code, which asks you to confirm. Or add it by hand:

Add to .vscode/mcp.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"
      ]
    }
  }
}

Add to ~/.codeium/windsurf/mcp_config.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"
      ]
    }
  }
}

Add to your client's MCP settings (most use this shape)

{
  "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"
      ]
    }
  }
}

Pricing

Open source

Prices change. Check genpark.ai before you buy.

GenPark Git Semantic Cherry-Pick Conflict Resolver 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 to GenPark Git Semantic Cherry-Pick Conflict Resolver

  1. REA

    MCP server

    CLI and MCP server that lets coding agents reverse engineer apps and binaries

    Runs locally
    • Open source
    • 464K GitHub stars
    • Developer tools
  2. Codebase Memory

    MCP server

    Local MCP server that builds a code knowledge graph for AI coding agents

    Runs locally
    • Open source
    • 48.7K GitHub stars
    • Knowledge and memory
  3. GitHub

    MCP server

    Official MCP server connecting AI assistants to GitHub repos, issues and workflows

    Not checked yet
    • Remote
    • Open source
    • 34.5K GitHub stars
    • Developer tools
  4. MCP toolkit giving coding agents symbol-level code retrieval and editing

    Runs locally
    • Open source
    • 31.5K GitHub stars
    • Developer tools
  5. XERJ

    MCP server

    Local search engine for AI agents with cited answers over your code and docs

    Runs locally
    • Open source
    • 19.2K GitHub stars
    • Knowledge and memory
  6. Ouroboros

    MCP server

    Spec-first layer that pins requirements and verifies results of AI coding agent work

    Runs locally
    • Open source
    • 6.4K GitHub stars
    • Developer tools