From a51b28a315d2d4bce0da46364f0dd3880011edd9 Mon Sep 17 00:00:00 2001 From: Chris Farhood Date: Tue, 26 May 2026 23:03:17 -0400 Subject: [PATCH] minor tweaks --- skills/sdlc/SKILL.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/skills/sdlc/SKILL.md b/skills/sdlc/SKILL.md index 8f69f81..ee1ac33 100644 --- a/skills/sdlc/SKILL.md +++ b/skills/sdlc/SKILL.md @@ -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: -| Branch | Environment | Who merges | -|--------|-------------|-----------| -| `dev` | Dev | Engineer (self-merges after CI passes) | -| `uat` | UAT | Engineer (merges after QA code review) | -| `main` | Production | Engineer (merges after UAT validation & CTO code review) | +| Branch | Environment | Who merges | Prerequisites for merge | +|--------|-------------|-----------|-----------| +| `dev` | Dev | Engineer | None (self-merges after CI passes) | +| `uat` | UAT | Engineer | QA code review approval | +| `main` | Production | Engineer | UAT validation & CTO code review | **Engineers always target `dev` first** — never `uat` or `main` directly. - Feature branches: `/`.