Skip to main content
Glama

Resolving a Merge Conflict on an MCP Server MCP servers

Production-ready MCP servers that extend AI capabilities through file access, database connections, APIs, and contextual services.

17,999 servers. Last updated 2026-03-01 13:58

Matching MCP tools:

Matching MCP Connectors:

"Resolving a Merge Conflict on an MCP Server" matching MCP servers:

  • -
    security
    F
    license
    -
    quality
    Provides integration between Merge API and LLM providers supporting the MCP protocol, allowing natural language interaction with Merge data across HRIS, ATS, and other categories.
    Last updated 10 months ago
    16
    • Apple
    • Linux
  • A
    security
    A
    license
    A
    quality
    Enables detection and resolution of Git merge conflicts in repositories through MCP, providing tools to identify conflicting files and assist with conflict resolution workflows.
    Last updated 2 months ago
    5
    1
    4
    AGPL 3.0
  • -
    security
    A
    license
    -
    quality
    Provides comprehensive A-share (Chinese stock market) data including stock information, historical prices, financial reports, macroeconomic indicators, technical analysis, and valuation metrics through the free Baostock data source.
    Last updated 7 months ago
    23
    MIT
    • Linux
    • Apple
  • -
    security
    F
    license
    -
    quality
    A comprehensive Model Context Protocol (MCP) server implementing the latest MCP specification with tools, resources, prompts, and enhanced sampling capabilities that features HackerNews and GitHub API integrations for AI-powered analysis.
    Last updated 8 months ago
    332
  • A
    security
    A
    license
    A
    quality
    A Model Context Protocol server focused on China's A-share stock market that provides data on stocks, financials, market indices, and macroeconomic indicators.
    Last updated 2 months ago
    41
    617
    MIT

Interested in MCP?

Join the MCP community for support and updates.

RedditDiscord