Skip to main content
Glama

Read Merge Conflict

read_merge_conflict
Read-only

Read one conflicted file of a merge in pages (cat -n style, 400 lines by default), with its conflict block line ranges. projectId is always the TARGET (the branch merged into); sourceProjectId is the branch merged in.

  • view: "markers" (the file with conflict markers; default), "source" or "target" (that branch's current file).

Tool call template

Replace each placeholder with a value matching the input schema. Only required parameters are included; add optional parameters as needed.

{
  "id": 1,
  "jsonrpc": "2.0",
  "method": "tools/call",
  "params": {
    "arguments": {
      "projectId": "<projectId>",
      "sourceProjectId": "<sourceProjectId>",
      "path": "<path>"
    },
    "name": "read_merge_conflict"
  }
}

Input Schema

NameRequiredDescriptionDefault
pathYes
viewNo
limitNo
offsetNo
projectIdYes
sourceProjectIdYes

Schema Changelog

Changes observed during successful MCP inspections.

  1. Added

TDQS

A4/5.0
Behavior4/5

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

Annotations already cover the safe/read-only profile, and the description adds real behavioral content beyond them: paged reads with cat -n style line numbering, a 400-line default page size, and the fact that conflict block line ranges are returned. It stops short of saying what a page response contains at the boundary (e.g. whether a next-offset is returned).

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?

Front-loaded with the core action and paging behavior, then a compact bullet for the view enum. No filler sentences; every clause conveys operational detail an agent needs.

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

Completeness4/5

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

With no output schema, the description does describe the returned shape (numbered lines plus conflict block ranges), which is the key gap-filler. It is slightly incomplete on pagination mechanics (total size, how to advance offset) for a tool that is explicitly paged.

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 0%, so the description carries the burden. It usefully clarifies that projectId is the target branch and sourceProjectId the branch merged in, and explains all three view values; however, path is left unstated and limit/offset are only obliquely implied by 'in pages' and '400 lines by default'.

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?

States a specific verb and resource — 'Read one conflicted file of a merge' — plus its scope (paged, cat -n style, 400 lines default) and what it returns (conflict block line ranges). That distinguishes it from the generic read_file/read_files siblings without needing to name them.

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?

Usage is only implied: an agent can infer it applies when a merge has conflicts, but the description never states when to choose this over read_file or get_merge_status, nor whether it should be called before card_confirm_merge. The view enum meanings are given, but no when-to-prefer guidance.

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

Try in Browser

Glama MCP Gateway

Add one secure layer between your agents and this server.

Resources