12 Nov
2010
12 Nov
'10
8:32 a.m.
On 12 November 2010 04:15, Rene Rivera <grafikrobot@gmail.com> wrote:
Originally live was a "branch" of beta, i.e. it was an "svn copy". But I guess I use a different definition than svn uses. I mean do a diff between them and copy over the changes you think are appropriate. Personally I use winmerge to do this. As I don't trust the "automated" merge features of any VC system.
I do and it saves a lot of effort. Whenever anyone copies content across I manually add the merge information to keep it up to date. Daniel