swarmops ws resolve#

Describes v0.11.0Last changed 2026-11-08View as Markdown

Mark conflicting paths of a rebase resolved.

Metadata

Group: workspaces
Since: 0.3.0
Mutates: yes
Identity required: no
MCP tool: ws_resolve
Envelope op: ws_resolve
Exit codes: 01
Errors: E_MARKERS_PRESENT

Syntax#

Syntax

swarmops ws resolve [OPTIONS] [PATH]...

Required arguments#

None.

Optional arguments#

The command also takes the global options.

Syntax: --ws <NAME>.

The workspace, by its name in the store's registry (default: the one around the working directory).

Syntax: --ws-path <DIR>.

The workspace's directory.

Syntax: <PATH>.

The paths resolved.

Syntax: --all.

Every conflicting path.

Syntax: --take <TAKE>.

Take one side's content instead of the file's. Values: ours: The workspace's own content; theirs: The target's content.

Syntax: --force.

Resolve a file that still holds a conflict marker line.

Syntax: --status-after <STATUS_AFTER>. Default: page.

page: the first page of the status follows the result; none: it is left out. Values: page: The first page of the status; none: No status.

Examples#

Shell

swarmops --repo [tmp]/store --as agent/worker-17 ws resolve --ws w2 src/lib.rs

Output, an error

{ "ok": false, "op": "ws_resolve", "api": 1, "error": { "code": "E_MARKERS_PRESENT", "message": "conflict markers are still in [\"src/lib.rs\"]", "retryable": false,

Show 15 more lines

"exit": 1, "details": { "paths": [ "src/lib.rs" ] }, "hint": "edit them out, or swarmops ws resolve --force <path>" }, "meta": { "repo": "[tmp]/store", "elapsed_ms": "[elapsed_ms]", "resolved": {}, "auth": "trust" } }

Exit code 1. Recorded by the CLI tests. A name in square brackets, such as [tmp] or [c1], stands for what differs from run to run: the test's temporary directory, an id, a time.

No recorded example yet.

Return information#

result is a WsResolveResp (swarmops schema WsResolveResp prints its JSON Schema).

Field	Type	Required	Description
`remaining`	`array of string`	yes	The paths that still conflict.
`resolved`	`array of string`	yes	The paths this request resolved.
`status_after`	`WsStatus or null`	no	The status after the mutation; omitted when the request said `none`.

Envelope op: ws_resolve.

Exit codes:

0: Success.
1: The operation failed.

Errors#

E_MARKERS_PRESENT (exit 1): ws resolve found a conflict marker line still in a file (details.paths).

Any command that opens a store may also fail with a store error, such as E_NOT_A_REPO, E_IO or E_STORE_CORRUPT; a command line the grammar refuses is E_INVALID_ARG (exit 2).