# HG changeset patch # User Thomas De Schampheleire # Date 2017-06-28 19:26:21 # Node ID a755bacaa725e84b041415d635d28589dc8f474e # Parent 1daec1628e0b742c4f0cdb47122f8a344d47d5f0 docs/contributing: clarify that Kallithea now also has a stable branch diff --git a/docs/contributing.rst b/docs/contributing.rst --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -183,9 +183,11 @@ mailing list. We aim at having all non- one other core developer before pushing. Obvious non-controversial changes will be handled more casually. -For now we just have one official branch ("default") and will keep it so stable -that it can be (and is) used in production. Experimental changes should live -elsewhere (for example in a pull request) until they are ready. +There is a main development branch ("default") which is generally stable so that +it can be (and is) used in production. There is also a "stable" branch that is +almost exclusively reserved for bug fixes or trivial changes. Experimental +changes should live elsewhere (for example in a pull request) until they are +ready. .. _coding-guidelines: