|Subject:||branch merge causes error|
|Date:||Fri, 1 Dec 2000 22:01:23 -0500|
When attempting to merge in changes from a branch with the:
cvs update -j labelname
command. I received the following:
retrieving revision 1.6
retrieving revision 184.108.40.206
Merging differences between 1.6 and 220.127.116.11 into filename
cvs server: write error
cvs server: subsidiary diff failed
labelname is a label made on the branch.
filename is a file where there will be a merge between the mainline and the branch.
What is this? How do I get rid of it?
|[Prev in Thread]||Current Thread||[Next in Thread]|