RE: CVS merge conflict

[Clendenan, Dave]

this may suit your needs - just runs against a single file.

you can drive it from 'find ... exec' if you have a 
bunch of files and a single revision tag...

hth

Dave


-----Original Message-----
From: Erik Andersson [mailto:address@hidden
Sent: Tuesday, October 26, 2004 2:15 PM
To: address@hidden
Subject: CVS merge conflict


Hi

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


_______________________________________________
Info-cvs mailing list
address@hidden
http://lists.gnu.org/mailman/listinfo/info-cvs

stickyCheat.pl
Description: Binary data