From 7b383dd9822f1d13e7703ddf22f7cd294b2e2c96 Mon Sep 17 00:00:00 2001 From: Julian Tabel Date: Tue, 10 Feb 2026 11:50:11 +0100 Subject: [PATCH] Set up branching structure and add branching rules to CLAUDE.md Create develop branch from main and document the branching strategy (main/develop/feature/*) in CLAUDE.md to enforce the workflow. Co-Authored-By: Claude Opus 4.6 --- .../nuzlocke-tracker-3c9l--set-up-branching-structure.md | 5 +++-- ...e-tracker-765i--update-claudemd-with-branching-rules.md | 4 ++-- .beans/nuzlocke-tracker-ahza--deployment-strategy.md | 4 ++-- CLAUDE.md | 7 +++++++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.beans/nuzlocke-tracker-3c9l--set-up-branching-structure.md b/.beans/nuzlocke-tracker-3c9l--set-up-branching-structure.md index 96e5127..5689362 100644 --- a/.beans/nuzlocke-tracker-3c9l--set-up-branching-structure.md +++ b/.beans/nuzlocke-tracker-3c9l--set-up-branching-structure.md @@ -1,10 +1,11 @@ --- # nuzlocke-tracker-3c9l title: Set up branching structure -status: todo +status: completed type: task +priority: normal created_at: 2026-02-09T15:30:35Z -updated_at: 2026-02-09T15:30:35Z +updated_at: 2026-02-10T10:49:55Z parent: nuzlocke-tracker-ahza --- diff --git a/.beans/nuzlocke-tracker-765i--update-claudemd-with-branching-rules.md b/.beans/nuzlocke-tracker-765i--update-claudemd-with-branching-rules.md index 6247fbb..9ef791d 100644 --- a/.beans/nuzlocke-tracker-765i--update-claudemd-with-branching-rules.md +++ b/.beans/nuzlocke-tracker-765i--update-claudemd-with-branching-rules.md @@ -1,11 +1,11 @@ --- # nuzlocke-tracker-765i title: Update CLAUDE.md with branching rules -status: todo +status: completed type: task priority: normal created_at: 2026-02-09T15:30:38Z -updated_at: 2026-02-09T15:31:15Z +updated_at: 2026-02-10T10:49:56Z parent: nuzlocke-tracker-ahza blocking: - nuzlocke-tracker-3c9l diff --git a/.beans/nuzlocke-tracker-ahza--deployment-strategy.md b/.beans/nuzlocke-tracker-ahza--deployment-strategy.md index a6542d6..caf6b87 100644 --- a/.beans/nuzlocke-tracker-ahza--deployment-strategy.md +++ b/.beans/nuzlocke-tracker-ahza--deployment-strategy.md @@ -45,8 +45,8 @@ Define and implement a deployment strategy for running the nuzlocke-tracker in p ## Checklist -- [ ] **Set up branching structure** — create `develop` branch from `main`, establish the `main`/`develop`/`feature/*` workflow -- [ ] **Update CLAUDE.md with branching rules** — once the branching structure is in place, add instructions to CLAUDE.md that the branching strategy must be adhered to (always work on feature branches, never commit directly to `main`, merge flow is `feature/*` → `develop` → `main`) +- [x] **Set up branching structure** — create `develop` branch from `main`, establish the `main`/`develop`/`feature/*` workflow +- [x] **Update CLAUDE.md with branching rules** — once the branching structure is in place, add instructions to CLAUDE.md that the branching strategy must be adhered to (always work on feature branches, never commit directly to `main`, merge flow is `feature/*` → `develop` → `main`) - [ ] **Configure Gitea container registry** — create an access token with `read:package` and `write:package` scopes, verify `docker login gitea.nerdboden.de` works, test pushing and pulling an image as a user-level package - [x] **Create production docker-compose file** (`docker-compose.prod.yml`) — uses images from the Gitea container registry, production env vars, no source volume mounts, proper restart policies - [x] **Create production Dockerfiles (or multi-stage builds)** — ensure frontend is built and served statically (e.g., via the API or a lightweight nginx container), API runs without debug mode diff --git a/CLAUDE.md b/CLAUDE.md index 71ed0fd..c3d2249 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1,3 +1,10 @@ +# Branching Strategy + +- **Never commit directly to `main`.** `main` is always production-ready. +- Day-to-day work happens on `develop`. +- New work is done on `feature/*` branches off `develop`. +- Merge flow: `feature/*` → `develop` → `main`. + # Instructions - After completing a task, always ask the user if they'd like to commit the changes.