strip_conflict_markers
Remove all Git merge conflict markers from a file, keeping both conflict sides. Reports the marker lines and conflict count, then writes the file atomically.
Instructions
Remove all Git merge conflict markers (<<<<<<< , =======, >>>>>>>) from a file in a single operation, keeping both sides of every conflict. Reports which lines the markers were on and how many conflicts were resolved. Writes atomically.
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": {
"path": "<path>"
},
"name": "strip_conflict_markers"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| path | Yes | Absolute or workspace-relative path to the file. | |
| encoding | No | File encoding. Default: utf-8. Pass utf-8-sig to strip a BOM. | utf-8 |
| project_root | No | Sets (and remembers) the project root for resolving relative paths for this and subsequent calls in the session. |