[cells-devel] Re: Cells

[Kenneth Tilton]

On Nov 14, 2004, at 2:41 AM, Christian Lynbech wrote:

>>>>>> "Kenneth" == Kenneth Tilton <ktilton at nyc.rr.com> writes:
>
> Kenneth> Maybe it is CVS i need to study.  Perhaps a CVS update would 
> handle
> Kenneth> the situation I described gracefully -- ie, notify me that I 
> need to
> Kenneth> manually merge?
>
> I am abit unsure what it is you are trying to do.
>
> If you have a file under CVS control, and you change it locally in
> your sandbox, and there is some update committed from somewhere else,
> a "cvs update" will try to add the diff to your locally changed file.
>
> This may work (if there are no overlapping changes) or it may fail in
> which case CVS flags the file as "conflicting" (there is now a 'C'
> printed in front of it in the "cvs update" output) and the conflicting
> changes are marked inside the file with "<<<<<" and ">>>>>" markers.

OK, fantastic. That can greatly simplify the cello set-up. I should 
have thought of this sooner. Anyway, when the dust settles on Cello/OS 
X I will straighten out the whole mess.

Thx, kenny