Best way to resolve svn "Two top-level reports with no target"
===

I have an svn repo

    http://path/to/svn/trunk

And have branched a few things from it to

    http://path/to/svn/branch

By using 

    svn copy http://path/to/svn/trunk/site1 http://path/to/svn/branch/site1 -m 'message'

I've done a lot of work on the branch but havent merged it back in, as it isn't ready for that.

However, I need to commit changes to trunk now, and I'm getting the following when attempting to do so

    > svn commit -m 'some message'
    svn: Commit failed (details follow):
    svn: Aborting commit: '/path/to/svn/trunk' remains in tree-conflict

I thought I should `svn up` on the /path/to/trunk but the following happens

    > svn up
    svn: Two top-level reports with no target

A `--force` doesn't help remedy the situation.

`svn status` results in lots of +'s next to the changed files

    > svn status
    M  +    site1/changedfile

Has anyone experienced this before, and can you shed some light on the issue at hand?