Replacing trunk with branch in Subversion

Question

Let\'s say people have been working on the trunk and on a branch of a Subversion repository. I want to discard any changes on the trunk, and replace it with a copy of the br

Answer 1

Merge all changes from the branch to the trunk, and then resolve all conflicts with

svn resolve path --accept theirs-full

Or, you can tell the merge to do that:

svn merge -rX:HEAD url/of/branch trunk\wc --accept theirs-full

After such a merge, you have a working copy which looks like the one on the branch. All you have to do is commit that trunk's working copy.