|
From: | Martin Jørgensen |
Subject: | Re: cvs update |
Date: | Sat, 04 Mar 2006 15:56:08 +0100 |
User-agent: | Mozilla Thunderbird 1.0.6 (Macintosh/20050716) |
Jim Hyslop wrote: -snip-
I don't think so. They're a safety feature, really - it makes sure you don't accidentally trash any of your valuable local changes. 'del /s .#*' will remove them.
Yeah, ok.
I was also interested in finding out how to resolve the conflict supposing that the file actually was important.... Something about this diff-utility, right?CVS will insert conflict markers that look something like this: <<<<<<< filename text that's in your local copy ======= conflicting text in the repositoryCVS revision number in the repositoryJust search for the '<<<<<<<' string, and examine the two sets of changes, keeping the one you want.
Ok, thanks a lot. I'll remember that for next time I get this problem (I deleted the file and pulled it out with cvs update because there were many of those <<<<<<< lines)... But that's okay because I know that I only wanted the version from the repository and not the local one...
Best regards / Med venlig hilsen Martin Jørgensen -- --------------------------------------------------------------------------- Home of Martin Jørgensen - http://www.martinjoergensen.dk
[Prev in Thread] | Current Thread | [Next in Thread] |