Mercurial > kallithea

comparison docs/contributing.rst @ 6737:a755bacaa725

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 29e9cb56f26f
comparison
equal deleted inserted replaced
6736:1daec1628e0b 6737:a755bacaa725
181 Everything non-sensitive should be discussed in public -- preferably on the 181 Everything non-sensitive should be discussed in public -- preferably on the
182 mailing list. We aim at having all non-trivial changes reviewed by at least 182 mailing list. We aim at having all non-trivial changes reviewed by at least
183 one other core developer before pushing. Obvious non-controversial changes will 183 one other core developer before pushing. Obvious non-controversial changes will
184 be handled more casually. 184 be handled more casually.
185 185
186 For now we just have one official branch ("default") and will keep it so stable 186 There is a main development branch ("default") which is generally stable so that
187 that it can be (and is) used in production. Experimental changes should live 187 it can be (and is) used in production. There is also a "stable" branch that is
188 elsewhere (for example in a pull request) until they are ready. 188 almost exclusively reserved for bug fixes or trivial changes. Experimental
189 changes should live elsewhere (for example in a pull request) until they are
190 ready.
189 191
190 .. _coding-guidelines: 192 .. _coding-guidelines:
191 193
192 194
193 Coding guidelines 195 Coding guidelines