Conflict upon add

2002-06-25 Thread Mike Ayers
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

Re: Conflict upon add

2002-06-25 Thread Larry Jones
Mike Ayers writes: 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