Skip to main content
Glama
mattyatea

Git Conflict MCP

by mattyatea
OverviewSchemaRelated ServersScoreDiscussions
TypeScript

Related Servers

Alternatives to Git Conflict MCP

No user-submitted related servers found.

    Related Servers

    • semamerge

      vineethwilson15
      A
      license
      A
      quality
      D
      maintenance
      MCP server that detects semantic (non-textual) merge conflicts between Git branches using AST-level analysis. Catches incompatible changes that Git merges cleanly — signature changes, removed exports, parameter changes, interface breaks, and cross-file dependency conflicts.
      4
      55
      MIT

    • mcp-gitwand

      devlint
      A
      license
      Not graded
      quality
      A
      maintenance
      an MCP server that auto-resolves Git merge conflicts so agents only touch the complex hunks — deterministic pattern engine with confidence scores and a full decision trace, plus merge/rebase preview and hunk-level resolution tools
      167
      MIT

    • Git MCP Server

      DanyelKirsch
      A
      license
      B
      quality
      D
      maintenance
      Provides comprehensive Git functionality to MCP clients, enabling users to manage repositories through operations like commits, diffs, and branch management via natural language. It automatically detects the current working directory and supports multi-project workflows across different local environments.
      16
      607
      2
      MIT

    Latest Blog Posts

    MCP directory API

    We provide all the information about MCP servers via our MCP API.

    curl -X GET 'https://glama.ai/api/mcp/v1/servers/mattyatea/git-conflict-mcp'

    If you have feedback or need assistance with the MCP directory API, please join our Discord server