1 files changed, 7 insertions, 0 deletions

diff --git a/README b/README
index 9c368e1..4ab63c6 100644
--- a/README
+++ b/README
@@ -6,6 +6,13 @@ replacement for Akonadi 1 at this point in time.
 Discussion of the code should be done on the kde-pim at kde.org mailing list
 or in #kontact on IRC.
 
+Note that all feature development should happen in feature branches, and that
+the mainline development branch is "develop". Master is for releases. It is
+recommended (though not required) to use the "git flow" tools to make branched
+development easy (and easy for others to coordinate with):
+
+    https://github.com/nvie/gitflow
+
 You can find information about the overall design here:
 
     https://community.kde.org/KDE_PIM/Akonadi_Next