From c4104c0cfe1b3f4c44b50cc4418faca4d7a6cf1d Mon Sep 17 00:00:00 2001 From: "ahmed.mujtaba" Date: Wed, 12 Aug 2026 16:49:09 +0500 Subject: [PATCH] . --- backend/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/backend/README.md b/backend/README.md index bd0d2f6..94128f9 100644 --- a/backend/README.md +++ b/backend/README.md @@ -1002,7 +1002,6 @@ psql "$DATABASE_URL" -f migrations/manual/001_dashboard_rbac_and_enum.sql system roles that need the dashboard, seeds the eleven BRD `source_channels`, and backfills `source_channel_id` / stage-transition / requisition-status rows. -<<<<<<< HEAD > **Run it with the session timezone set to UTC.** The file writes `NOW()` into columns of > both kinds. A client whose session timezone is not UTC stores a shifted wall clock in any > naive column and a correct instant in the `timestamptz` ones, which is how the current dev @@ -1020,9 +1019,6 @@ backfills `source_channel_id` / stage-transition / requisition-status rows. > so a fresh clone cannot reach head. Combined with `DB_AUTOGENERATE=true`, each developer's > instance invents its own revision ids for the same schema change and the histories diverge. > Fix the pattern and commit the missing revisions before anyone else clones this branch. -======= -``` ->>>>>>> c283ac0e50dbe497671957e7fb064edb75f5988b Migrations run under a Postgres advisory lock, so several workers booting at once cannot migrate concurrently. Empty revisions are suppressed. Alembic's own `alembic_version` table is