Skip to main content

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.

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

Synopsis

murmur queue conflict-resolution [flags] <slug> <repo> <strategy>

Arguments

NameTypeRequiredDescription
slugstringyesThe agent’s slug.
repostringyesRepository display name (e.g. org/repo).
strategystringyesOne of merge, rebase, or none. See Strategies below.
--workspacestringnoWorkspace name. Overrides the value from murmur.yaml.

Strategies

ValueBehavior
mergeMerge the base branch into the working branch on file changes.
rebaseRebase the working branch onto the base branch on file changes.
noneSuppress file-changed notifications for this repo entirely.

Examples

Switch a repo to rebase

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

murmur queue conflict-resolution fix-auth acme/docs none
conflict resolution set to none for fix-auth (repo acme/docs)
The agent keeps working in acme/docs but no longer receives notifications when the base branch advances.

Errors

CodeMeaningWhat to do
NOT_FOUNDNo agent with that slug exists, or the repo is not attached to the agent.Use murmur ls and murmur status to verify the slug and the agent’s repos.
UNAUTHENTICATEDIdentity token is missing or expired.Run murmur auth or check your murmur.local.yaml configuration.
invalid strategyThe strategy value is not merge, rebase, or none.Pass one of the supported strategies listed above.