> ## Documentation Index
> Fetch the complete documentation index at: https://docs.murmur.dev/llms.txt
> Use this file to discover all available pages before exploring further.

# murmur queue conflict-resolution

> Set how a running agent handles base-branch changes on a specific repo — rebase, merge, or abort when the upstream branch advances mid-task.

Sets the conflict resolution strategy that a running [agent](/concepts/agents) uses for a specific repository when the base branch changes underneath it. Each repository the [agent](/concepts/agents) is working in can have its own strategy.

## Synopsis

```bash theme={null}
murmur queue conflict-resolution [flags] <slug> <repo> <strategy>
```

## Arguments

| Name          | Type   | Required | Description                                                                     |
| ------------- | ------ | -------- | ------------------------------------------------------------------------------- |
| `slug`        | string | yes      | The [agent's](/concepts/agents) slug.                                           |
| `repo`        | string | yes      | Repository display name (e.g. `org/repo`).                                      |
| `strategy`    | string | yes      | One of `merge`, `rebase`, or `none`. See [Strategies](#strategies) below.       |
| `--workspace` | string | no       | [Workspace](/concepts/workspaces) name. Overrides the value from `murmur.yaml`. |

## Strategies

| Value    | Behavior                                                        |
| -------- | --------------------------------------------------------------- |
| `merge`  | Merge the base branch into the working branch on file changes.  |
| `rebase` | Rebase the working branch onto the base branch on file changes. |
| `none`   | Suppress file-changed notifications for this repo entirely.     |

## Examples

### Switch a repo to rebase

```bash theme={null}
murmur queue conflict-resolution fix-auth acme/backend rebase
```

```
conflict resolution set to rebase for fix-auth (repo acme/backend)
```

### Silence file-changed notifications on a noisy repo

```bash theme={null}
murmur queue conflict-resolution fix-auth acme/docs none
```

```
conflict resolution set to none for fix-auth (repo acme/docs)
```

The [agent](/concepts/agents) keeps working in `acme/docs` but no longer receives notifications when the base branch advances.

## Errors

| Code               | Meaning                                                                                                           | What to do                                                                                                                  |
| ------------------ | ----------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
| `NOT_FOUND`        | No [agent](/concepts/agents) with that slug exists, or the repo is not attached to the [agent](/concepts/agents). | Use [`murmur ls`](/cli/ls) and [`murmur status`](/cli/status) to verify the slug and the [agent's](/concepts/agents) repos. |
| `UNAUTHENTICATED`  | Identity token is missing or expired.                                                                             | Run `murmur auth` or check your `murmur.local.yaml` configuration.                                                          |
| `invalid strategy` | The strategy value is not `merge`, `rebase`, or `none`.                                                           | Pass one of the supported strategies listed above.                                                                          |

## Related

* [Agents](/concepts/agents) — concept overview
* [`murmur queue add`](/cli/queue-add) — send a follow-up to an agent
* [`murmur queue clear`](/cli/queue-clear) — discard all queued follow-ups
* [`murmur queue strategy`](/cli/queue-strategy) — set how follow-ups are drained
* [`murmur subscriptions add`](/cli/subscriptions-add) — subscribe to branch/file events