codesplitter.notryanquinn.workers.dev
Every line is its own record, so people and agents edit the same file at once without stepping on each other.
First seen 2026-11-05 · Last seen 2026-11-05 · Source: webmcp.com
Answer 7 · Act 41 · Transact 0 · Score: Not yet scored
Tool inspector
settle_conflict
Settle one conflict card on a branch's merge page, as clicking would: pick main, branch, both, both:branch-first, suggestion, or text (with `text`, the lines that replace it). Nothing lands until the branch's Merge button is pressed.
Page: /
Input schema
| Property | Type | Required | Description |
|---|---|---|---|
branch |
string | yes | — |
path |
string | yes | — |
line |
string | yes | the conflict's line, as list_conflicts says |
pick |
string | yes | — |
text |
string | no | with pick text: the settled lines |
Raw JSON schema
{
"type": "object",
"properties": {
"branch": {
"type": "string"
},
"path": {
"type": "string"
},
"line": {
"type": "string",
"description": "the conflict's line, as list_conflicts says"
},
"pick": {
"type": "string",
"enum": [
"main",
"branch",
"both",
"both:branch-first",
"suggestion",
"text"
]
},
"text": {
"type": "string",
"description": "with pick text: the settled lines"
}
},
"required": [
"branch",
"path",
"line",
"pick"
]
}
Similar websites
morphus.myles4miles.chatgpt.site
Morphus is an AI-native workspace for designing worlds and generating playable game experiences.
damnpdfs.com
Install the DamnPDFs Codex plugin, pair a browser workspace and use PDF, image and file tools from your coding agent. Includes setup and privacy limits.
insignifi4nt.github.io
broCAD/M: local-first CAD and CAM for parametric design, wire EDM planning, simulation and controller export.
cabinet.varera.studio
The Cartographer's Cabinet