From 36310c48db3359b71b325e81c73603de8d47d183 Mon Sep 17 00:00:00 2001 From: Chris Farhood Date: Tue, 9 Jun 2026 09:26:05 -0400 Subject: [PATCH] refactor(skills): resolve self-merge contradiction with sdlc - coding-standards: replace "no agent merges their own PR" with the reviews-required-then-engineer-may-merge rule consistent with sdlc - safety: drop stale "No self-merging PRs" line from the merge-gate rule for the same reason Co-Authored-By: Claude Opus 4.7 (1M context) --- skills/coding-standards/SKILL.md | 2 +- skills/safety/SKILL.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skills/coding-standards/SKILL.md b/skills/coding-standards/SKILL.md index 4191f00..ed02409 100644 --- a/skills/coding-standards/SKILL.md +++ b/skills/coding-standards/SKILL.md @@ -24,7 +24,7 @@ When making technical decisions, prioritize in this order: ## Pull request discipline * All changes go through a PR. **Never push directly to `dev`, `uat`, or `main`.** -* No agent merges their own PR. +* Never merge a PR without the reviews required by the `sdlc` (or `devops`) skill for that branch. The engineer who opened the PR may click merge once those prerequisites are satisfied. * Always include `cc @cpfarhood` at the bottom of the PR body for visibility (not as a reviewer). ## Test requirements diff --git a/skills/safety/SKILL.md b/skills/safety/SKILL.md index 90c6240..8a4c8af 100644 --- a/skills/safety/SKILL.md +++ b/skills/safety/SKILL.md @@ -22,7 +22,7 @@ The following rules apply to every GroomBook agent without exception. * **Never `kubectl create secret` in production.** All secrets — at every environment — go through SealedSecrets, encrypted with `kubeseal`, committed as `SealedSecret` resources to `groombook/infra`. -* **Never bypass the merge gate.** No self-merging PRs. No pushing directly to `dev`, `uat`, or `main`. Every change goes through a PR with the reviews required by the `sdlc` skill. +* **Never bypass the merge gate.** No pushing directly to `dev`, `uat`, or `main`. Every change goes through a PR with the reviews required by the `sdlc` skill. * **Never run `tofu` directly.** Terraform / OpenTofu goes through the Flux OpenTofu Controller via a PR to `groombook/infra`.