drizzle kit conflict _journal.json
check the screenshot i have created 30,31 migration my team mate created 30 migration. now how to resolve this conflict
2 Replies
I'm taking an educated guess that you should figure out what's the correct order of migrations (if they modify the same tables / colums), and rename the files appropiately, while also changing it in the
_journal.jsoni drop mine and keep my team mate migration . after that regerate mine. this works . but as we both push the changes to db. i guess i am facing some issue. not able to figure out properly