incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dave Fisher <dave2w...@comcast.net>
Subject Re: SVN and issues with branching / consider how we use SVN going forward
Date Wed, 08 Aug 2012 23:18:26 GMT

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


Mime
View raw message