From: David T. <tom...@us...> - 2010-08-26 07:03:22
|
To maintain a modicum of organisation, I have created two new branches in SVN: svn:/tsheetx/branches/timesheet.ng-1.5.x_iphone/ svn./tsheetx/branches/timesheet.ng-1.5.x_zimbra/ I also deleted some old unused maintenance branches. So I suggest the following rules: 1. Keep /trunk for bugfixes and simple improvements to V1.5.x (like translation support) 2. The 2.0 branch has changes (mostly from Rob) that should be taken up. But not necessarily now. 3. Use the other branches during development of larger changes, and merge back to trunk when ready. Obviously, it's an open game so anyone can play to the rules they like, and it depends on when and how many changes come in, but let's see how we get on. Cheers |