Skip to main content
Glama
Sign In
Smart Git MCP Server & CLI

Smart Git MCP Server & CLI

by rafim-dev
OverviewSchemaSourceRelated ServersDiscussionsAdmin
TypeScript
Local

git_resolve_conflicts

Scan your repository for merge conflict markers and receive synthesized resolution options to resolve conflicts.

Instructions

Scan the repository for merge conflict markers (<<<<<<< HEAD) and provide synthesized resolution options.

Tool call template

This tool declares no required parameters. Add optional parameters from the input schema as needed.

{
  "id": 1,
  "jsonrpc": "2.0",
  "method": "tools/call",
  "params": {
    "arguments": {},
    "name": "git_resolve_conflicts"
  }
}

Input Schema

NameRequiredDescriptionDefault
cwdNoTarget repository directory path

Schema Changelog

Changes observed during successful MCP inspections.

  1. First observedv0.1.0

TDQS

A3.7/5.0
Behavior3/5

Does the description disclose side effects, auth requirements, rate limits, or destructive behavior?

No annotations are provided, so the description carries the full burden. It says 'scan' and 'provide ... options', which suggests a non-mutating read operation, but it does not explicitly state that no files are modified, whether staging is affected, or what happens if no conflicts are found.

Agents need to know what a tool does to the world before calling it. Descriptions should go beyond structured annotations to explain consequences.

Conciseness5/5

Is the description appropriately sized, front-loaded, and free of redundancy?

The description is a single sentence that immediately communicates the purpose and outcome. There is no filler or repetitive content; every phrase earns its place.

Shorter descriptions cost fewer tokens and are easier for agents to parse. Every sentence should earn its place.

Completeness3/5

Given the tool's complexity, does the description cover enough for an agent to succeed on first attempt?

The tool is simple and the one parameter is well-covered by the schema, but with no output schema and no annotations, the description does not explain the form of the resolution options, behavior when no conflicts are found, or whether the tool changes the repository. It gives a general sense but not full completeness.

Complex tools with many parameters or behaviors need more documentation. Simple tools need less. This dimension scales expectations accordingly.

Parameters3/5

Does the description clarify parameter syntax, constraints, interactions, or defaults beyond what the schema provides?

Schema description coverage is 100% for the single 'cwd' parameter, which is already described as 'Target repository directory path'. The description itself adds no extra meaning, but with full schema coverage, a baseline of 3 is appropriate.

Input schemas describe structure but not intent. Descriptions should explain non-obvious parameter relationships and valid value ranges.

Purpose5/5

Does the description clearly state what the tool does and how it differs from similar tools?

The description clearly states a specific action ('Scan the repository'), a specific target ('merge conflict markers') and what it produces ('synthesized resolution options'). It is readily distinguishable from sibling tools like git_status, git_smart_commit, git_review_diff, and git_release_changelog.

Agents choose between tools based on descriptions. A clear purpose with a specific verb and resource helps agents select the right tool.

Usage Guidelines3/5

Does the description explain when to use this tool, when not to, or what alternatives exist?

The description implies usage when merge conflict markers exist, but it does not explicitly state when to use it versus alternatives, nor does it mention any prerequisites or when not to use it. The context is adequate but purely implied.

Agents often have multiple tools that could apply. Explicit usage guidance like "use X instead of Y when Z" prevents misuse.

Deploy Server

Other Tools