Re: [boost] [website] beta vs. live website

Subject: Re: [boost] [website] beta vs. live website
From: Daniel James (dnljms_at_[hidden])
Date: 2010-11-12 03:32:45

On 12 November 2010 04:15, Rene Rivera <grafikrobot_at_[hidden]> 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