On 11/22/05, André
Lähr <address@hidden>
wrote:
Hi!
Sorry if you got this
email more than once, but i had some trouble with my email client.
:)
I got a
problem with CVS.
First of all, I am using CVS under Linux.
If I
replace a file in my updated working copy I am not able to do a merge
afterwards. Even if i don't replace it but copy and paste the whole contents
in that working copy it doesn't work.
There is no error message. The
System just responds with:
M filename
Please specify the merge command you are using.
and nothing
happens. I
think it's because I already updated to the newest Revision. But do I have
no possibility to replace the updated working copy by any other file and
redo a merge?
You always have the possibility to replace an updated working copy.
André
_______________________________________________
Info-cvs
mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/info-cvs