aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/CONTRIBUTING
diff options
context:
space:
mode:
authorGravatar Dieter Plaetinck <dieter@plaetinck.be>2009-05-18 22:39:22 +0200
committerGravatar Dieter Plaetinck <dieter@plaetinck.be>2009-05-18 22:39:22 +0200
commit30131ffa360fc398e8b6393159f992f1adf89af1 (patch)
treebb57b9d9281d5558b48b62988eae1fa5eca70c6e /docs/CONTRIBUTING
parentb520d89768e989c7312395d3d511b66947763cdb (diff)
branches conventions
Diffstat (limited to 'docs/CONTRIBUTING')
-rw-r--r--docs/CONTRIBUTING4
1 files changed, 4 insertions, 0 deletions
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