[ardour-dev] Help with merge to trunk from surfaces

[John Anderson]

I'm not getting this right. I had a look at the relevant parts of the
svn book, tried saying

svn merge svn+ssh://ardoursvn@ardour.org/ardour2/trunk svn+ssh://ardoursvn@ardour.org/ardour2/branches/surfaces

and

svn merge svn+ssh://ardoursvn@ardour.org/ardour2/branches/surfaces  svn+ssh://ardoursvn@ardour.org/ardour2/trunk

But those didn't work. Then I tried checking out trunk and then saying

svn merge -r1303:1449 svn+ssh://ardoursvn@ardour.org/ardour2/branches/surfaces

But then I get 10 conflicted files.

Should I go through and edit the conflicted files, or did I do something
wrong in the merge command?

thanks
John