[Tinyos-help] CVS update error?

[Vinai Sundaram]

This is usually because there is a newer version available in CVS and 
you have modified your local version, which is now not the latest. To 
get the latest version from CVS, you can simply move your xxx.xx file to 
yyy.yy and do a cvs update. If you want to commit your modifications to 
CVS(which I guess you don't ), you have to resolve the conflicts manually.

Hope this helps,
Vinai.

Shi Yuan wrote:
> When I try to use CVS update, it says 
> cvs update: move away xxx.xx; it is in the way  
> C xxx.xx
>
> I check CVS manual, "C" means "A merge was necessary but collisions were
> detected (requiring manual merging)". How to solve this? Thanks.
>
> _______________________________________________
> Tinyos-help mailing list
> Tinyos-help at Millennium.Berkeley.EDU
> https://mail.millennium.berkeley.edu/cgi-bin/mailman/listinfo/tinyos-help
>
>