Mike Castle wrote:
>
>On Thu, Mar 08, 2001 at 11:15:52AM -0800, Stephen Rasku wrote:
>> Why is this a problem? You can always do "cvs update -A" after you
>> have checked in your changes to get rid of the sticky tag.
>
>Because it mucks up binary files?
>
That shouldn't apply in this case since he was attempting a merge of,
apparently, a .c file. You can't merge binary files with CVS.
--
Stephen Rasku E-mail: [EMAIL PROTECTED]
Senior Software Engineer Web: http://www.pop-star.net/
TGI Technologies
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
