minor tweaks
This commit is contained in:
@@ -21,11 +21,11 @@ Gitea is the **primary source of truth**. Every Paperclip issue must have a corr
|
|||||||
|
|
||||||
Three long-lived branches map to the three deployment environments:
|
Three long-lived branches map to the three deployment environments:
|
||||||
|
|
||||||
| Branch | Environment | Who merges |
|
| Branch | Environment | Who merges | Prerequisites for merge |
|
||||||
|--------|-------------|-----------|
|
|--------|-------------|-----------|-----------|
|
||||||
| `dev` | Dev | Engineer (self-merges after CI passes) |
|
| `dev` | Dev | Engineer | None (self-merges after CI passes) |
|
||||||
| `uat` | UAT | Engineer (merges after QA code review) |
|
| `uat` | UAT | Engineer | QA code review approval |
|
||||||
| `main` | Production | Engineer (merges after UAT validation & CTO code review) |
|
| `main` | Production | Engineer | UAT validation & CTO code review |
|
||||||
|
|
||||||
**Engineers always target `dev` first** — never `uat` or `main` directly.
|
**Engineers always target `dev` first** — never `uat` or `main` directly.
|
||||||
- Feature branches: `<agent-name>/<short-description>`.
|
- Feature branches: `<agent-name>/<short-description>`.
|
||||||
|
|||||||
Reference in New Issue
Block a user