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

# Merge Conflicts

> Resolve Dolt merge conflicts

This runbook helps you resolve merge conflicts that occur during Dolt sync operations.

## Symptoms

* `bd dolt pull` fails with conflict errors
* Different issue states between clones

## Diagnosis

```bash theme={null}
# Check database health
bd doctor

# Preview what fixes would be applied
bd doctor --dry-run
```

## Solution

**Step 1:** Back up current state

```bash theme={null}
cp -r .beads .beads.backup
```

**Step 2:** Check for conflicts

```bash theme={null}
bd doctor
```

**Step 3:** Fix to reconcile

```bash theme={null}
bd doctor --fix
```

**Step 4:** Verify state

```bash theme={null}
bd list
bd stats
```

**Step 5:** Push resolved state

```bash theme={null}
bd dolt push
```

## Prevention

* Sync before and after work sessions using `bd dolt pull` / `bd dolt push`
* Avoid concurrent modifications from multiple clones without the Dolt server running