git_conflict_resolve
Resolve open Git conflicts in Cartographer wiki files using ours, theirs, edit, or union strategies; after all are cleared, changes are merged, committed, and pushed.
Instructions
Resolves a git conflict. strategy: ours (local), theirs (remote), edit (reconciled body), union (log.md only). Once every open conflict (conflicts_list) is resolved, Cartographer merges, commits, pushes and clears the degraded markers.
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": {
"concept_id": "<concept_id>",
"strategy": "<strategy>"
},
"name": "git_conflict_resolve"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| body | No | Full file content; for edit | |
| strategy | Yes | ||
| concept_id | Yes |