[Mpls-pm] Meeting tonight?

Ken Williams ken at mathforum.org
Wed Oct 13 14:35:38 CDT 2004


On Oct 13, 2004, at 2:29 PM, Andy Lester wrote:

> On Wed, Oct 13, 2004 at 02:09:16PM -0500, Ken Williams 
> (ken at mathforum.org) wrote:
>> I'll pick you up if you promise to tell me how to merge changes 
>> between
>> branches in CVS.
>
> cvs update -j branch-name

Oh, that much I knew.  But it always seems to ignore branch changes I'd 
previously merged in, and always gets confused by changes I've made in 
the head branch.  I was hoping for a way to do the merge without having 
to hold its hand through a million conflicts every time.

  -Ken



More information about the Mpls-pm mailing list