On Aug 6, 2012, at 8:38 PM, Justin Mclean wrote: > Hi, > > JFYI there may be less issue with more recent versions of SVN and branching. > > In that you can keep branches up to date like so: > svn merge pathtotrunk > > And then merging via: > svn merge --reintegrate pathtobranch > > Any tired this? How does it work in practise?
Developing on trunk all you need to do is: svn up svn add svn status svn commit Really I hardly need to merge. If you svn up often you resolve any conflicts early. You can discuss any questions on the list. Regards, Dave > > Thanks, > Justin
