# swarmops ws resolve

> Release: 0.11.0 · Last changed: 2026-11-08 · Source: https://github.com/KeiaiLab/SwarmOps/blob/stable/docs/reference/commands/ws-resolve.md

Mark conflicting paths of a rebase resolved.

```yaml
title: "swarmops ws resolve"
description: "Mark conflicting paths of a rebase resolved."
group: "workspaces"
since: "0.3.0"
mutates: true
identity_required: false
mcp_tool: "ws_resolve"
envelope_op: "ws_resolve"
exit_codes: [0, 1]
errors: [E_MARKERS_PRESENT]
syntax: "swarmops ws resolve [OPTIONS] [PATH]..."
```

## Syntax

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

## Required arguments

None.

## Optional arguments

The command also takes the [global options](../cli.md#global-options).

### `--ws`

Syntax: `--ws <NAME>`.

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

### `--ws-path`

Syntax: `--ws-path <DIR>`.

The workspace's directory.

### `PATH`

Syntax: `<PATH>`.

The paths resolved.

### `--all`

Syntax: `--all`.

Every conflicting path.

### `--take`

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.

### `--force`

Syntax: `--force`.

Resolve a file that still holds a conflict marker line.

### `--status-after`

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

### CLI

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

```json
{
  "ok": false,
  "op": "ws_resolve",
  "api": 1,
  "error": {
    "code": "E_MARKERS_PRESENT",
    "message": "conflict markers are still in [\"src/lib.rs\"]",
    "retryable": false,
    "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.

### MCP

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`](../errors.md#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`](../errors.md#e_not_a_repo), [`E_IO`](../errors.md#e_io) or [`E_STORE_CORRUPT`](../errors.md#e_store_corrupt); a command line the grammar refuses is [`E_INVALID_ARG`](../errors.md#e_invalid_arg) (exit 2).

## See also

- [`swarmops ws create`](ws-create.md)
- [`swarmops ws status`](ws-status.md)
- [`swarmops ws diff`](ws-diff.md)
- [`swarmops ws commit`](ws-commit.md)
- [`swarmops ws rebase`](ws-rebase.md)
- [`swarmops ws land`](ws-land.md)
- [`swarmops ws materialize`](ws-materialize.md)
- [`swarmops ws discard`](ws-discard.md)
- [`swarmops ws snapshot`](ws-snapshot.md)
- [`swarmops ws list`](ws-list.md)
- [`swarmops ws info`](ws-info.md)
- [`swarmops ws delete`](ws-delete.md)
- [`swarmops ws hook`](ws-hook.md)
- [CLI reference](../cli.md)
- [Error codes](../errors.md)