From 861aed9dd4c0a9c8fe2183a9892f68ec2f64b03c Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 24 Jul 2019 12:40:05 +0200 Subject: [PATCH] Update GITHUB.md --- GITHUB.md | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/GITHUB.md b/GITHUB.md index 02836a37..cee4cc8c 100644 --- a/GITHUB.md +++ b/GITHUB.md @@ -2,20 +2,23 @@ GitHub Branches =============== master: - The current up-to-date working branch, that users download It should - only contain the latest release and bug fixes. + The current up-to-date working branch, that users download. It should + only contain the latest stable release and bug fixes. -develop-lcpq: - Toulouse development branch - -develop-lct: - Paris development branch - -develop: +dev: It is a fork of the *master* branch with new developments that will be merged in the *master* branch for the next release. Other development branches should be merged on this one. +bugfix: + A fork of the *master* on which the bug fixes are made. + +dev-lcpq: + Toulouse development branch + +dev-lct: + Paris development branch + gh-pages: This is an independent branch, containing only the web site of QP2.