[EMAIL PROTECTED] writes: > > What are and of what purpose are *,t-files? > In my case they seem to be appeared when new files where created.
Exactly. The *,t file stores the message you supplied (with -m) to the add command until you commit the file (and the message goes into the RCS file). > I'm suffering from unresolved conflicts which I can't resolve, > update won't work (cvs update: conflict: *file* created independently by > second party) That means that there is already a file in the repository with the same name. What you need to do is to rename your file and then "cvs remove" it to undo the add, do a "cvs update" to get the file checked out of the repository, and then compare your file to the repository file and resolve any conflicts however you like. -Larry Jones He piqued my curiosity. -- Calvin _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
