Re: cvs update info

[Mark D. Baushke]

richard blair <address@hidden> writes:

> I perform a cvs update on a large directory structure, and a conflict
> happens, but the file it happened on is too far up to scroll to.  Does
> anyone know how to retrieve that information? In other words, how do I
> find out which files were in conflict after I have performed an update?

If you run 'cvs -n update' again, the files that are in conflict will be
listed. You may also run the 'cvs status' command to see files that are
in conflict ("File had conflicts on merge").

        Enjoy!
        -- Mark