[commits] [Wiki] changed: Doc/Dev/Branches

[Ralf Lang (B1 Systems GmbH)]

rlang  Sun, 24 Nov 2019 12:34:19 +0000

Modified page: https://wiki.horde.org/Doc/Dev/Branches
New Revision:  3
Change log:  Marked some outdated info

@@ -1,4 +1,6 @@
+This information is aged. Post git split, horde doesn't use a develop  
branch anymore. Features get developed in feature branches or most  
times forks and integrated into the master branch via pull requests. I  
have not checked for other outdated info.
+
  + Branch management

  We follow a branching model that is a very simplified version of  
http://nvie.com/posts/a-successful-git-branching-model/. The main  
difference is that we do bug fixing and make releases from the  
//master// branch, and only use release branches for older, still  
maintained versions. It is suggested to read this post first, to get  
an larger view on the ideas behind our branching model.