[Top][All Lists]

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

Re: CVS-GUI tool

From: Colm Murphy
Subject: Re: CVS-GUI tool
Date: Fri, 15 Mar 2002 09:48:18 +0000
User-agent: Mozilla/5.0 (Windows; U; WinNT4.0; en-GB; rv:0.9.4) Gecko/20011019 Netscape6/6.2

tkdiff can be used to highlight and resolve conflicts.
tkdiff -conflict FILE


Colm A

Bharat wrote:

Is there any GUI-tool to use CVS in which conflicts can be solved easily.
<<Like there in VSS (Visual Source Safe)>>
I'm facing a problem of commiting files having conflicts with their
older versions, as some another user has made changes.
Please reply me at address@hidden

reply via email to

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