Solved!
It turned out to be the way I created the branch. I had taken a copy of
the trunk folder in windows explorer and in the copy done a branch and
switch. It was in this copy that that merge was failing.
I created a brand new folder and did a svn checkout on the branch.
Merge worked beautif
ubject: Re: Merge Failing
On Wed, Jan 12, 2011 at 9:22 PM, SUMNER Andrew
wrote:
> Sorry if anyone gets this twice - I originally mailed to users at subversion
> dot tigris dot org on the advice of somebody, but when I actually went to
> the site it suggested this mailing list.
>
&g
On Wed, Jan 12, 2011 at 9:22 PM, SUMNER Andrew
wrote:
> Sorry if anyone gets this twice – I originally mailed to users at subversion
> dot tigris dot org on the advice of somebody, but when I actually went to
> the site it suggested this mailing list.
>
>
>
> I am attempting to merge the project t
