From cbb192ffe865ffb3eed4c940177ffecaecfa570f Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 9 Feb 2015 12:58:34 +0100 Subject: note on branching model for dev --- README | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'README') 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 -- cgit v1.2.3