On Mon, Aug 04, 2014 at 02:05:33PM +1000, Daniel Becroft wrote:
> Hi,
>
> Using: svn 1.8.8 (r1568071)
>
> When attempting to merge a change into my working copy, I am getting a tree
> conflict (change adds a file, file already exists). No problem with the
> conflict.
>
> Conflict discovered
Hi,
Using: svn 1.8.8 (r1568071)
When attempting to merge a change into my working copy, I am getting a tree
conflict (change adds a file, file already exists). No problem with the
conflict.
Conflict discovered when trying to add 'foo\A\B\c.p'.
An object of the same name already exists.
