[Bf-committers] OS X Okay

[LarstiQ]

On Wed, May 14, 2003 at 02:02:48PM -0700, Charles Wardlaw wrote:
> Hi,
> 
> This is a CVS problem.  Sometimes, if you've edited a file and then do
> a cvs update, it won't know what to do and you end up with sections
> like this:

This isn't a problem, but the result of a merge with conflicts. Instead
of just overwriting your own modifications, CVS merges the two and flags
a conflict. If you missed the flagging, you will be notified by the
compile not going on. The two versions are denoted by << version, and
seperated by ====, you can then choose how to merge by hand (I
frequently end up deleting one of the two) and continue from there.

> 
> <<<<<<<<< 1.5
> 
> variable = something;
> 
> <<<<<<<<<< 1.6
> 
> variable = something_else;
> 
> >>>>>>>>>>>
> 
> You may need to delete the file and / or grab a copy from the CVS
> browser on the website.

Of course, deleting the file and doing a cvs update also works.

LarstiQ