[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Conflict problem...

From: pilvis
Subject: Conflict problem...
Date: Wed, 11 Oct 2000 11:34:55 -0000
User-agent: eGroups-EW/0.82

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]