[Top][All Lists]

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

Re: file,t

From: Larry Jones
Subject: Re: file,t
Date: Wed, 10 Oct 2001 14:50:46 -0400 (EDT)

Wim_DAUSY/BE/address@hidden 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

> 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

reply via email to

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