Mercurial > kallithea
changeset 6737:a755bacaa725
docs/contributing: clarify that Kallithea now also has a stable branch
| author | Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> |
|---|---|
| date | Wed, 28 Jun 2017 21:26:21 +0200 |
| parents | 1daec1628e0b |
| children | ffb70a338ce1 |
| files | docs/contributing.rst |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/contributing.rst Wed Jun 28 21:24:54 2017 +0200 +++ b/docs/contributing.rst Wed Jun 28 21:26:21 2017 +0200 @@ -183,9 +183,11 @@ 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: