GenPark Git Semantic Cherry-Pick Conflict Resolver

io.github.alphaparkincPublished by GitHub account alphaparkincv1.0.1Updated Oct 27, 2026

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

VerifiedSTDIODesktop onlyDeveloper Tools

Overview

AI-generated overview

Local MCP server that resolves Git cherry-pick and rebase conflicts by aligning code hunks through AST analysis instead of plain text diffing.

What you can do
  • Aligns three-way code hunks using AST structure for cherry-pick and rebase patches
  • Resolves conflicts between non-overlapping code blocks semantically rather than line by line
  • Works on local Git patch and conflict scenarios inside a desktop assistant session
When to use it
Useful when cherry-picking or rebasing commits across branches and textual conflicts appear in code that is structurally compatible but textually shifted. Suited to developers who want an assistant to help untangle patch conflicts in a local repository.
Requirements
Runs as a local stdio process on the user's machine, launched with Python 3 (the README shows a python command running mcp_server.py). Desktop-only; no web execution. No authentication, environment variables or headers declared, and no third-party dependencies beyond the Python standard library.
Before you install
It operates on Git patches and conflict resolution, so it can change working-tree or repository state during a cherry-pick or rebase; review results before committing. No credentials or network access are declared, but the manifest lists no tools, so verify actual capabilities before relying on it.

Installation

In SourceWeft

  1. Open GenPark Git Semantic Cherry-Pick Conflict Resolver in the dashboard and add it to a workspace.
  2. Enable the server for the chats that should use its tools.

Desktop only via STDIO. STDIO servers start a local process, so they need the SourceWeft desktop host.

Other MCP clients

Follow the launch instructions in the repository.

README

genpark-git-semantic-cherry-pick-conflict-resolver-skill

[Verified by Smithery] [LinkedIn] [Website]

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:

json
{  "mcpServers": {    "genpark-git-semantic-cherry-pick-conflict-resolver-skill": {      "command": "python",      "args": ["mcp_server.py"]    }  }}

Zero Dependencies

Implemented entirely in Python 3 standard library.

Source: README.md at commit a03c933

Tools

0
SourceWeft has not started this package in its sandbox yet, so its tools are not known.

Version history

1
  1. v1.0.1LatestOct 19, 2026

Score

40% of the applicable checks met

How complete this listing is, computed from the registry entry, the endpoint and public sources. Not a rating of the server and not a statement that it is safe or working today: reachability is a dated check, and no installs or reviews go into the score.

  • Reached in the last 30 days25 pts

    Keep the endpoint answering the MCP handshake; SourceWeft probes it every 30 days.

  • Auth declared10 pts

    Declare the credential headers in the registry entry, or keep the endpoint answering the probe so its auth can be classified.

  • Tools listed15 pts

    Answer tools/list without a credential, or ship a package that starts in a sandbox without one.

  • DescriptionRequired15 pts
  • Logo10 pts
  • Documentation15 pts
  • License10 pts

    Declare a license in the repository or the registry entry.