Prisma Migration Conflict After Schema Changes

1. Two developers created different migrations with the same timestamp or conflicting changes
2. Local migration files were deleted but database state remains
3. Database already has the schema changes but Prisma migrations don't reflect this
4. Merging branches with different migration histories
5. Manual database changes made outside of Prisma migrations

Resolve merge conflicts: If merging branches, check git history of migrations/ folder for conflicts. Resolve manually and recreate new migration.

Reset in development: For dev only: npx prisma migrate reset clears database and replays migrations from scratch.

Recovery in production: Use npx prisma migrate resolve --rolled-back migration_name to mark failed migration as rolled back, then create a new one.

Prevent conflicts: Use npx prisma migrate dev --name descriptive_name to create new migrations, commit them before pushing.