diff --git a/packages/db/.gitattributes b/packages/db/.gitattributes new file mode 100644 index 0000000000..86b126bc15 --- /dev/null +++ b/packages/db/.gitattributes @@ -0,0 +1,10 @@ +# Drizzle-generated migration snapshots + journal. Regenerated by +# `drizzle-kit generate`, never hand-edited. Two branches that each add a +# migration produce divergent snapshots (and journal entries) that CANNOT be +# meaningfully text-merged — the id/prevId chain and schema state are computed, +# so a line-level merge yields a snapshot matching no real `generate` run. The +# only correct resolution is to renumber one migration and regenerate. Hence: +# linguist-generated=true GitHub collapses the huge diff, excludes from stats +# -merge git refuses to auto-merge and raises a loud conflict +# instead of silently fabricating a bogus snapshot +src/migrations/meta/** linguist-generated=true -merge