From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Mon, 18 May 2009 20:39:22 +0000 (+0200)
Subject: branches conventions
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=30131ffa360fc398e8b6393159f992f1adf89af1;p=uzbl-mobile

branches conventions
---

diff --git a/docs/CONTRIBUTING b/docs/CONTRIBUTING
index f351da9..9a2ff35 100644
--- a/docs/CONTRIBUTING
+++ b/docs/CONTRIBUTING
@@ -25,6 +25,10 @@ If you're new to Git/github, have no fear:
 * [Github guides (highly recommended)](http://github.com/guides/home)
 * [Guides: Fork a project and submit your modifications](http://github.com/guides/fork-a-project-and-submit-your-modifications)
 
+Our convention is to develop in the *experimental* branch, and keep only stable, tested stuff in *master*.
+So ideally, all contributors develop in their experimental, that gets merged into the mainline experimental, and after QA it gets merged into the main master.
+
+
 ### VALGRIND PROFILING
 	$ add this to Makefile header: CFLAGS=-g
 	$ recompile