Merge halted with "Error reading spooled REPORT request response"
From: Yuen-Chi Lian <me_at_yclian.com>
Date: Thu, 19 Nov 2009 11:07:09 +0800
Hi,
I am trying to merge a feature branch to the trunk (with some local
--- Merging r2267 through r2464 into '.':
However, when I really perform the merge, svn will fail at:
svn: Attempt to add tree conflict that already exists
$ svn st
After resolving the conflict and re-run the same merge command, svn will
Thanks.
-- Yuen-Chi Lian | www.yclian.com "I do not seek; I find." - Pablo Picasso ------------------------------------------------------ http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2419819 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.