[Top][All Lists]

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

Conflict upon add

From: Mike Ayers
Subject: Conflict upon add
Date: Tue, 25 Jun 2002 07:18:35 -0700
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.0.0) Gecko/20020530

Using WinCVS, I added a PDF file to my archive (PDFs illustrate the problem of text file canonicalization - I don't know whether they're text or binary, but must check them in as one or the other). Once added, it displayed as a conflict file. It is my understanding that one needs revisions of a file for that file to be in conflict, yes? Any idea what is happening here?


reply via email to

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