[Mpls-pm] Meeting tonight?
shane at aptest.com
Wed Oct 13 14:38:00 CDT 2004
Simple - stop using branches... or stop using CVS... or stopy modifying
the same damn files in the same places.
Sorry - going through this ourselves right now. What a pain.
Ken Williams wrote:
> 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.
> Mpls-pm mailing list
> Mpls-pm at mail.pm.org
Shane P. McCarron Phone: +1 763 786-8160 x120
Managing Director Fax: +1 763 786-8180
ApTest Minnesota Inet: shane at aptest.com
More information about the Mpls-pm