summaryrefslogtreecommitdiff
path: root/DEVELOPMENT
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-10-21 13:56:54 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-10-21 13:56:54 (GMT)
commitef04011cd03703ee29b02aba9b2ceb1a9b514362 (patch)
tree7cc09dac713f92c205220409de9c39985bce7b70 /DEVELOPMENT
parenta9475bc23620e8c0e9c4fe19f080f5daaa7c9c56 (diff)
downloadlibkolabxml-ef04011cd03703ee29b02aba9b2ceb1a9b514362.tar.gz
Use merge instead of rebase
Diffstat (limited to 'DEVELOPMENT')
-rw-r--r--DEVELOPMENT6
1 files changed, 3 insertions, 3 deletions
diff --git a/DEVELOPMENT b/DEVELOPMENT
index 8ef05f5..3a60e90 100644
--- a/DEVELOPMENT
+++ b/DEVELOPMENT
@@ -11,9 +11,9 @@ Branch layout:
python/master
- is occassionally, regularly, rebased on top of master. Bindings
- are then generated, modified where necessary, test-cases
- executed, and naturally we hope all is well.
+ is occassionally, regularly, merged with the master branch.
+ Bindings are then generated, modifications are updated where
+ necessary, test-cases executed, and naturally we hope all is well.
<major>.<minor>