Skip to content

Commit 5bf220f

Browse files
committed
docs(repo): forbid local main merges
1 parent c2a6510 commit 5bf220f

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎AGENTS.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Examples:
2828
- After a coherent batch is committed locally, push it to `origin/dev`.
2929
- Open a pull request from `dev` to `main` for review and release tracking.
3030
- Merge the pull request into `main` only after the release candidate is ready.
31+
- If pull request merge permission is unavailable, stop at the PR step and hand the PR back to a maintainer.
32+
- Do not merge `dev` into `main` locally as a substitute for the GitHub pull request flow.
3133
- Do not push release changes directly to `origin/main`.
3234

3335
## Documentation Map

‎docs/deployment.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ For the current production inventory and ownership map, also see `docs/productio
1919
- push validated work to `origin/dev`
2020
- create a pull request from `dev` to `main`
2121
- merge `dev` into `main` only after release validation passes
22+
- if the current operator cannot merge the pull request, stop and hand the PR to a maintainer instead of merging locally
2223
- production deployments should run from `main`
2324
- `apps/web` and `apps/admin` production must be deployed by Cloudflare Workers Builds from `main`
2425
- local `wrangler deploy` to the production Workers is not part of the normal release flow
@@ -31,7 +32,7 @@ For Rebase, production frontend releases now follow a single source of truth:
3132
2. validate locally and with preview builds
3233
3. push the validated branch to `origin/dev`
3334
4. create a pull request from `dev` to `main`
34-
5. merge the release candidate into `main`
35+
5. merge the release candidate into `main` through the GitHub pull request
3536
6. let Cloudflare Workers Builds publish production from `main`
3637

3738
This avoids a mismatch where production is newer than GitHub.

‎docs/production-config.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ Use `infra/production/server.env.example` as the committed template.
141141
- day-to-day work continues on `dev`
142142
- validated work should be pushed to `origin/dev`
143143
- releases should move from `dev` to `main` through a pull request
144+
- if the current operator cannot merge the pull request, they must stop at the PR step and wait for a maintainer
144145
- production Workers Builds track `main`
145146
- API server deployment should use release-ready code, not unreviewed local changes
146147

0 commit comments

Comments
 (0)