Merge Conflicts Recovery

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

Symptoms

• bd sync fails with conflict errors
• Different issue states between clones

Diagnosis

# Check database health
bd doctor

# Check for Dolt conflicts
bd doctor --fix

Solution

Step 1: Check for conflicts

bd doctor

Step 2: Force rebuild to reconcile

bd doctor --fix

Step 3: Verify state

bd list
bd stats

Step 4: Sync resolved state

bd sync

Prevention

• Sync before and after work sessions
• Use bd sync regularly
• Avoid concurrent modifications from multiple clones without the Dolt server running