diff options
| author | Aaron Seigo <aseigo@kde.org> | 2015-02-09 12:58:34 +0100 |
|---|---|---|
| committer | Aaron Seigo <aseigo@kde.org> | 2015-02-09 12:58:34 +0100 |
| commit | cbb192ffe865ffb3eed4c940177ffecaecfa570f (patch) | |
| tree | 151bcfc3cab30d635f1d048c80ca7f0332db3b9d | |
| parent | 9d2f550759fc9d46e1039368ef77988cdc3a61e4 (diff) | |
| download | sink-cbb192ffe865ffb3eed4c940177ffecaecfa570f.tar.gz sink-cbb192ffe865ffb3eed4c940177ffecaecfa570f.zip | |
note on branching model for dev
| -rw-r--r-- | README | 7 |
1 files changed, 7 insertions, 0 deletions
| @@ -6,6 +6,13 @@ replacement for Akonadi 1 at this point in time. | |||
| 6 | Discussion of the code should be done on the kde-pim at kde.org mailing list | 6 | Discussion of the code should be done on the kde-pim at kde.org mailing list |
| 7 | or in #kontact on IRC. | 7 | or in #kontact on IRC. |
| 8 | 8 | ||
| 9 | Note that all feature development should happen in feature branches, and that | ||
| 10 | the mainline development branch is "develop". Master is for releases. It is | ||
| 11 | recommended (though not required) to use the "git flow" tools to make branched | ||
| 12 | development easy (and easy for others to coordinate with): | ||
| 13 | |||
| 14 | https://github.com/nvie/gitflow | ||
| 15 | |||
| 9 | You can find information about the overall design here: | 16 | You can find information about the overall design here: |
| 10 | 17 | ||
| 11 | https://community.kde.org/KDE_PIM/Akonadi_Next | 18 | https://community.kde.org/KDE_PIM/Akonadi_Next |