Read Merge Conflict
read_merge_conflictRead 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
| Name | Required | Description | Default |
|---|---|---|---|
| path | Yes | ||
| view | No | ||
| limit | No | ||
| offset | No | ||
| projectId | Yes | ||
| sourceProjectId | Yes |