X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FUpdate.md;h=c4fe16186380c011d539b895e51baed3d93a2422;hb=56a77f5275ba8566a37d690ade0e929c88b828e2;hp=7f8a0fcae5bbf76051f1b446f1dc415ae6030e3d;hpb=33957dc2a4d4d68497bc29d775974074e8e86319;p=friendica.git diff --git a/doc/Update.md b/doc/Update.md index 7f8a0fcae5..c4fe161863 100644 --- a/doc/Update.md +++ b/doc/Update.md @@ -36,11 +36,11 @@ The addon tree has to be updated separately like so: git pull For both repositories: -The default branch to use is the ``master`` branch, which is the stable version of Friendica. +The default branch to use is the ``stable`` branch, which is the stable version of Friendica. It is updated about four times a year on a fixed schedule. If you want to use and test bleeding edge code please checkout the ``develop`` branch. -The new features and fixes will be merged from ``develop`` into ``master`` after a release candidate period before each release. +The new features and fixes will be merged from ``develop`` into ``stable`` after a release candidate period before each release. Warning: The ``develop`` branch is unstable, and breaks on average once a month for at most 24 hours until a patch is submitted and merged. Be sure to pull frequently if you choose the ``develop`` branch.