[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Converting a branch into the main trunk

From: Chuck . Irvine
Subject: RE: Converting a branch into the main trunk
Date: Tue, 7 Nov 2000 08:44:55 -0600

You don't say what the purpose of the trunk is; it's probably your
stable baseline. That being said, I would recommend that you do things
in the typical way, i.e. merge the branch into the trunk. If the branch
is very different than the trunk, then CVS should do the right thing,
i.e. make the trunk "look" like the branch. If your branch represents a
nearly complete rewrite of your application, then large parts of your
original application will essentially get merged away. My best advice is
to experiment a lot with CVS if you are somewhat new to it, but in
general you can trust it to "work" correctly.

-----Original Message-----
From: Chris.Deever [mailto:address@hidden
Sent: Tuesday, November 07, 2000 7:31 AM
To: info-cvs
Subject: Converting a branch into the main trunk

When merging a development branch into the HEAD trunk, is it possible to
somehow insure that code development branch always overwrites the main

Since CVS does a line by line diff comparison to determine what code to
merge, I'm a bit hesitant to do the merge since the two versions of code
very different at this point.  I'd like to know that the code in the
development branch will always take precedence over code in the HEAD

Maybe there is a way to simply rename the branches?



Info-cvs mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]