diff options
author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-05-18 22:39:22 +0200 |
---|---|---|
committer | Barrucadu <mike@barrucadu.co.uk> | 2009-05-19 20:07:07 +0100 |
commit | e026e9f93039571f912445f87f7ef8823e65621d (patch) | |
tree | 7f297ed472948a9e7d5d30a265a29228e045f2da /docs/CONTRIBUTING | |
parent | 2e4dfe9c23165f32c5161dd2c4dbf09c60e10191 (diff) |
branches conventions
Diffstat (limited to 'docs/CONTRIBUTING')
-rw-r--r-- | docs/CONTRIBUTING | 4 |
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 |