From 51fc9828a086a201e39c5061a951deea592dae9b Mon Sep 17 00:00:00 2001
From: vikingowl <christian@nachtigall.dev>
Date: Sat, 25 Apr 2026 13:35:41 +0200
Subject: [PATCH] chore(docs): document local branch-merge-push git workflow

---
 CLAUDE.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CLAUDE.md b/CLAUDE.md
index b45a5c1..9fb4373 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -38,6 +38,19 @@ Monorepo at `gitlab.com/vikingowl/marktvogt.de`. Components are regular director
 - **Veranstalter** is the central role — creates markets, manages plots, reviews applications, configures tickets.
 - **Mitarbeiter** (staff) is a sub-role under Veranstalter with granular permissions.
 
+## Git Workflow
+
+When asked to "commit to a new branch, merge to main, and push":
+
+```bash
+git checkout -b <branch-name>
+git add <files>
+git commit -m "<message>"
+git checkout main && git merge --ff-only <branch-name> && git push origin main && git branch -d <branch-name>
+```
+
+No MR/PR needed for this pattern — merge locally, push main directly.
+
 ## Development Conventions
 
 - All planning docs use ASCII (no umlauts) for cross-platform compatibility.