summaryrefslogtreecommitdiff
path: root/doc/DEVELOP.md
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-07-04 22:02:05 +0200
committerAzul <azul@riseup.net>2016-07-05 08:56:05 +0200
commit78d1b0daae8b7d667c8cb5a8da0b1efba029801f (patch)
treed45a0ea7e660d8751e64d517b52f0fe05362d837 /doc/DEVELOP.md
parent6b08e8c89d26225786736ad69ba335b275a1a048 (diff)
[doc] make sure to mention develop branch in dev docs
Diffstat (limited to 'doc/DEVELOP.md')
-rw-r--r--doc/DEVELOP.md14
1 files changed, 14 insertions, 0 deletions
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