Help with git diff

When we merge branch with migrations we can get a git diff. Resolving them has been always a non easy process. Is there a guide or good practices to make it more streamlined and safe ?
1 Reply
MAST
MAST12mo ago
What I do is copy my new migration that is on the branch and then use drizzle-kit drop to drop it. Merge/Rebase the branch to get the new migration and then generate the migration again and paste my migration.
Want results from more Discord servers?
Add your server