Conflict problem...

[pilvis]

if two users use same file at same time, what do I have to do
that I can keep both versions? CVS gives me message like:
'NONMERGEABLE FILE NEEDS MERGE', what does that mean and how can I
merge this file ???
And now this file is conflict file...!
Please somebody help me!

Best Regards
P�ivi


_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs