From 78d1b0daae8b7d667c8cb5a8da0b1efba029801f Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 4 Jul 2016 22:02:05 +0200
Subject: [doc] make sure to mention develop branch in dev docs

---
 doc/DEVELOP.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'doc')

diff --git a/doc/DEVELOP.md b/doc/DEVELOP.md
index e0c07d6..97ecd25 100644
--- a/doc/DEVELOP.md
+++ b/doc/DEVELOP.md
@@ -1,5 +1,19 @@
 # Development #
 
+## Branches
+
+We use the 'master' branch to hold the version currently deployed to the
+production servers. Only hotfixes are applied here.
+
+Most of development happens based upon the 'develop' branch. So unless
+you are investigating a specific issue that occured in production you
+probably want to base your changes on 'develop':
+```
+git checkout origin/develop -b my-new-feature
+```
+This will create a new branch called 'my-new-feature' based on the develop
+branch from the origin remote.
+
 ## Setting up the local CouchDB
 
 CouchDB operates in Admin Party by default, meaning there are no access
-- 
cgit v1.2.3