RE: cvs conflict question
"Arthur Barrett" <[email protected]> Wed, 23 Oct 2013 11:36:18 +1100
| Newsgroups | gmane.comp.version-control.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Ahmed, > Is there a way how to force an update and ignore these=20 > conflicts. Because the files in CVSROOT and the workspace are=20 > the same.=20 No - you need to get to the root cause of the conflict. =20 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