From 48a56b31f6b844555f80d9c49f35b0a9518a1bf3 Mon Sep 17 00:00:00 2001
From: Erik Simon <mail@erik-s.dev>
Date: Tue, 28 Jul 2026 21:32:55 +0200
Subject: [PATCH] Document develop/master branching model in CLAUDE.md

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 CLAUDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index eb64572..b7408c8 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -8,7 +8,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Workflow
 
-Do not commit directly to `master`. All feature work goes on a `feature/<name>` branch and all bug fixes go on a `fix/<name>` branch, merged back via PR.
+Do not commit directly to `master` or `develop`. All feature work goes on a `feature/<name>` branch and all bug fixes go on a `fix/<name>` branch, cut from `develop` and merged back into `develop` via PR. `develop` is periodically merged into `master` with its commits squashed into a single release commit — `master` should only ever contain release commits.
 
 ## Build