[Cvsnt] conflict error

Tony Hoyle tmh at nothing-on.tv
Thu Jan 17 15:42:19 GMT 2002

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.

On Thu, 17 Jan 2002 15:18:24 +0000 (UTC), Jane Fothergill
<jane at northern-atlas.com> wrote:

>cvs update: conflict: common.asp is modified but no longer in the repository
>right, it was there,  somehow I'd put a sticky tag on it which I hadn't
>meant.  So, I deleted the tag using:
>cvs tag -D tagname common.asp
>the response was
>D common.asp
>now, when I update I get the above error.  I can't add it, or commit.
Try using 'update -A' to reset the sticky tag on the file.  -D will
physically delete the tag from the repository but not change the tag
on the local file.


Cvsnt mailing list
Cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook