DB Migration Conflict Resolution

Goal

Resolve Drizzle migration conflicts without manually editing migration SQL or meta/_journal.json.

Workflow

1. Inspect conflict scope.

• Run git status --short.
• Confirm the migration conflict includes packages/db/src/migrations/meta/_journal.json.
• If non-migration conflicts need product decisions, stop and ask the user.

2. Fetch the base branch.

• Run git fetch origin.
• Default to origin/main unless the user requests another base branch.

3. Keep incoming journal history as baseline.

• Run git checkout --theirs packages/db/src/migrations/meta/_journal.json.
• Do not hand-edit packages/db/src/migrations/meta/_journal.json.