[Top][All Lists]

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

CVS merge conflict

From: Erik Andersson
Subject: CVS merge conflict
Date: Tue, 26 Oct 2004 23:15:11 +0200


Anyone know of a script that can resolve conflicts (or any other nice
unix tool). Lets say you know that you should use all from one version
of the file and not the other. That should be quite easy to fix a script
for. (But I'm too tired now and need to hit the bed.) I really don't
want to do this manually.

Please help me out ;-)

Best Regards / Erik

reply via email to

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