From bf5747e382278ff0883a580592e31444b51ef716 Mon Sep 17 00:00:00 2001
From: nrb <freifunk@nicoboehr.de>
Date: Wed, 15 Jun 2022 16:56:23 +0200
Subject: [PATCH] add branch description to README

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 58ab4cfd8..50e1ef25a 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,12 @@ When changing something in Gluon, keep in mind - besides making the changes in t
 
 Minor version updates of Gluon are usually very easy to do. Therefore, we have a daily job which checks for a new minor version of Gluon and performs an [automatic update](https://gitlab.freifunk-stuttgart.de/firmware/ffs-pipeline-nightly) if one is available.
 
+## Branches
+
+For each firmware release (vX.Y) we have a seperate branch.
+
+There is also the experimental branch which is our build against Gluon master. Most bugfixes hence need to be applied to the corresponding branch of the next firmware release and the experimental branch.
+
 ## Other repositories
 
 We have a [repository with our custom packages](https://gitlab.freifunk-stuttgart.de/firmware/gluon-packages).
-- 
GitLab