[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
merge issues
|
From: |
Jacob Burckhardt |
|
Subject: |
merge issues |
|
Date: |
Tue, 15 May 2001 11:09:15 -0700 |
address@hidden writes:
>
> We are using CVS version 1.10 running on Solaris 2.8.
> A 'problem' occured when CVS merged a file multiple users had checked out and
> altered.
...
> Please help. Our understanding of CVS's merge function should have caught
> these
> differences. Is our understanding correct? Can you tell us how to avoid this
> 'problem' in the future?
Upgrade to cvs-1.11.1p1.
cvs 1.10.x and earlier versions have a bug which can cause the
problems you describe.