[Top][All Lists]

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

Re: Conflict problem...

From: Derek R. Price
Subject: Re: Conflict problem...
Date: Wed, 11 Oct 2000 10:20:44 -0400

address@hidden wrote:

> 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!

CVS won't merge binary files.  It makes sense - it's not immediately
obvious how two GIFs should be merged, though it's possible you could
come up with a method for specific applications.  And merging GIFs would
require a different method than M$Word documents would.

If you want to keep both versions, I expect all you need to do is copy
one of the files to a new name and check that into source control too.


Derek Price                      CVS Solutions Architect ( )
mailto:address@hidden     OpenAvenue ( )
106. I want to die peacefully, in my sleep, like my grandfather,
     not screaming, terrified, like his passengers.

reply via email to

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