Reintegration of Branch to Trunk error
From: Bolles, David <dbolles_at_zygo.com>
Date: Thu, 18 Oct 2012 19:58:30 +0000
I am trying to reintegrate a a Branch version of code back into the Trunk and I get the following error:
I am currently using Tortoise SVN v.1.5.2, Build 13595 - 32-bit
What can I do to resolve this error?
Dave B.
CONFIDENTIALITY NOTICE: This e-mail transmission and any documents accompanying this e-mail transmission may contain information from Zygo Corporation which is confidential privileged and/or controlled by export regulations. The information is intended only for the use of the intended recipient. No confidentiality or privilege is waived or lost by any transmission errors. If you are not the intended recipient, you are hereby notified that any use, disclosure, copying, distribution or the taking of any action in reliance on the contents of this e-mail information is strictly prohibited, and the documents should be returned to Zygo Corporation immediately. If you have received this e-mail in error please notify us immediately by e-mail at the address set forth above.
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.