From f2c1a9e2d61751bbf113ab9f2ecda2fcab1e03fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20M=C3=B6rling?= <jcamorling@gmail.com>
Date: Thu, 30 Apr 2026 15:34:00 +0200
Subject: [PATCH] =?UTF-8?q?docs:=20add=20branching=20strategy=20=E2=80=94?=
 =?UTF-8?q?=20master,=20develop,=20feature/*=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AGENTS.md            |  5 +++++
 CODING_GUIDELINES.md | 40 ++++++++++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 71eb674..3d7ca14 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -115,6 +115,11 @@ Full details in `@CODING_GUIDELINES.md`. Key rules:
 - No commented-out code. Delete it.
 - Functions stay small (<30 lines).
 
+### Git
+- Create `feature/*`, `fix/*`, or `chore/*` branches from `develop`.
+- Never commit directly to `master` or `develop`.
+- Merge strategy: fast-forward or merge — either is fine.
+
 ### Frontend (Vue.js 3)
 - `<script setup>` with Composition API only. Never Options API.
 - File naming: PascalCase for pages/components, camelCase (`useXxx`) for composables.
diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md
index decb609..4852083 100644
--- a/CODING_GUIDELINES.md
+++ b/CODING_GUIDELINES.md
@@ -20,6 +20,40 @@ Conventions and standards for the BilHej codebase. These exist to keep the proje
 
 ## 2. Git
 
+### Branch Model
+
+Three permanent branches, plus short-lived work branches:
+
+```
+master ──────────────────────────────────────●──●  (production, deployed)
+                                              ↗  ↗
+develop ────────●──────────●────────●───────●──●  (integration)
+               ↗           ↗        ↗
+feature/foo ──●──●──●───→┘        │
+                                   │
+feature/bar ───────────────────────●──●─────→┘
+```
+
+| Branch | Purpose | Branches from | Merges to |
+|--------|---------|---------------|-----------|
+| `master` | Production — what runs on the server | — | — |
+| `develop` | Integration — all work branches land here | `master` | `master` (on release) |
+| `feature/*` | New feature work | `develop` | `develop` |
+| `fix/*` | Bug fix | `develop` | `develop` |
+| `chore/*` | Maintenance, upgrades, docs | `develop` | `develop` |
+
+### Rules
+
+- **Never commit directly to `master` or `develop`.** All work happens in feature/fix/chore branches.
+- **Merge strategy**: fast-forward or merge — either is fine for a solo dev project. Prefer simple over complex.
+- **Keep branches short-lived.** Merge back to `develop` within a few days. Don't let branches drift.
+- **Update before merging.** Pull latest `develop` into your branch before merging back to avoid surprises.
+- **Tag releases on `master`**: `v0.1.0`, `v0.2.0`, etc. These mark deployable states.
+- **Rebase**: only rebase your own unpublished branches. Once pushed/shared, merge instead.
+- **CI triggers**: push to `develop` → run tests. Push to `master` → run tests + deploy.
+- **Squash trivial fix commits** before pushing (typo fixes, formatting, etc.).
+- **Never commit `.env`, credentials, or secrets. `.env.example` only.**
+
 ### Branch Naming
 
 ```
@@ -41,12 +75,6 @@ chore: bump vue to 3.5
 
 Types: `feat`, `fix`, `refactor`, `chore`, `docs`, `test`, `style`
 
-### Workflow
-
-- Work directly on `main` until you have a reason not to (MVP phase).
-- Squash trivial fix commits before pushing.
-- Never commit `.env`, credentials, or secrets. `.env.example` only.
-
 ---
 
 ## 3. Frontend — Vue.js 3