summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2011-03-05 20:25:58 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2011-03-05 20:26:02 +0100
commitf2348ba05300118b1475441e6f75be3995603c49 (patch)
treeef7c430c859043e3f947a4fdce6cdfae231bbcf4 /README
parente6b5746203c18b1c2e935a9a714909ad7e92e5f6 (diff)
Make master a stable branch, move development to rewritable branches
Diffstat (limited to 'README')
-rw-r--r--README5
1 files changed, 5 insertions, 0 deletions
diff --git a/README b/README
index 3e36df1..888645f 100644
--- a/README
+++ b/README
@@ -47,6 +47,11 @@ The goal of AIF is not (yet) to:
2) be more fancy then needed
+** Branches **
+-> master: "stable" tree, infrequent updates
+-> develop: unstable development tree, which may get rewritten at some points,
+ only when things have settled down (every x weeks/months), gets pushed to master
+-> optionally: more topic branches which are rewriteable and which come and go
** A bit of history **