From aef2a31977269eee75b4856ca898a8efc67ede8c Mon Sep 17 00:00:00 2001 From: bisco Date: Wed, 29 Apr 2026 21:54:49 +0200 Subject: [PATCH] docs: add lightweight git workflow policy --- .codex/project.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.codex/project.md b/.codex/project.md index 9fd31d6..5dd3f00 100644 --- a/.codex/project.md +++ b/.codex/project.md @@ -121,14 +121,22 @@ enabled_profiles: Work must happen on the current feature branch for the task. +## Git Workflow Policy + +- `develop` is the integration branch. +- `main` is reserved for stable releases. +- For non-trivial changes, Codex MUST work on a dedicated task branch. +- Allowed task branch prefixes: `feature/`, `fix/`, `docs/`, `chore/`. +- Codex MUST NOT merge into `develop` or `main`. +- Codex may commit only on the current task branch after required checks pass. +- The human operator reviews, merges, pushes, and deletes branches. + Allowed branch prefixes when a new branch is explicitly needed: - `feature/` - `fix/` -- `hotfix/` - `chore/` - `docs/` -- `refactor/` Do not merge task branches into `develop`. Leave integration to the repository owner or a separate explicit request.