[cvsnt] Re: Branch woes

[Gerhard Fiedler]

UL Jarod wrote:

> My main question is this:  I'd like to update the changes that were made
> to the trunk since the branching point onto Delta, and move the branch
> point to the front of the trunk.  (Essentially rebranching, but without
> losing the changes made on the delta branch.) 

You can simply merge the main branch into the Delta code. 

Why do you want to move the branch point? 

Gerhard