how do you deal with merge conflicts in `migrate.l...
# orm-help
s
how do you deal with merge conflicts in
migrate.lock
? it says to run
prisma migrate fix
but it says the command doesn’t exist when I try
r
Hey @Sebastien La Duca 👋 In what step did the
prisma migrate fix
command appear? Could you send a screenshot of that if possible?
s
is there a recommended way to deal with conflicts? I’ve just been deleting
migrations/
but that’s not going to work once there is actual data
r
As
prisma migrate
is currently experimental, the workaround would be to reset the migration by deleting the 
_Migrations
 table from the DB and also also removing the 
migrations
 folder. We will also remove the
prisma migrate fix
command as that doesn't exist in the latest Prisma version.
👍 1