merging the 2 branches in git git pull origin main -> to get the latest main branch git merge -> to merge the branch with the main branch git push orgin main -> to push into the main branch migrating and pushing inside the DB npx prisma migrate dev (abort the data loss) npx prisma db push