DEVELOPMENT
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Fri Oct 21 15:57:13 CEST 2011
DEVELOPMENT | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ef04011cd03703ee29b02aba9b2ceb1a9b514362
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Oct 21 14:56:54 2011 +0100
Use merge instead of rebase
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>
More information about the commits
mailing list