From f0e75c9bb1182a739c3646d2e746977f2de40d48 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Wed, 28 Jun 2017 11:09:20 +0200 Subject: [PATCH] Updated contributing guide. --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6049b9f97..f6c528479a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,7 @@ +# Which code branch to use + +The master branch is used for code (mostly new features) that shall go into the next major release (e.g. 3.2, 3.3 and so on). The stable branch (e.g. stable-3.1, stable-3.2) is the branch for the current intermediate and bugfix releases. Bugfixes shall be committed to the current stable branch and not the master branch. The stable branch is merged to the master automatically from time to time, please do not submit bugfixes a second time against the master. + # Some guidelines for web development with php. ----------------------------------------------------- * Unix Line Breaks Only, NO windows breaks please. -- GitLab