[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: cvs conflict question
|
From: |
Arthur Barrett |
|
Subject: |
RE: cvs conflict question |
|
Date: |
Wed, 23 Oct 2013 11:36:18 +1100 |
Ahmed,
> Is there a way how to force an update and ignore these
> conflicts. Because the files in CVSROOT and the workspace are
> the same.
No - you need to get to the root cause of the conflict.
If the conflict is not happening elsewhere then it may be resolved by
simlpy deleting the existing sandbox and doing a clean checkout. Also
check that you are using the same version/release of CVS on the build
machine as you are in your test sandbox.
Regards,
Arthur Barrett