Merging Branch into Trunk

Question

Now I know this has been asked a few times, but i'm still not getting it...

I use Versions which is doing a great job, I am also using beansalk and they are working nicely together. However, I have been working on a branch of the trunk (sandbox) which I now want to merge back into the trunk. Versions can't do this, so it's into Terminal.

Sandbox is reversion 256 and the Trunk (because of a few other amends) is 255.

Answer 1

Simple, juste use the merge: svn merge -r N:M SOURCE [PATH]

Example: $ svn merge -r 250:HEAD HTTP_OR_SSH_OR_SVN://path_to_your_local_or_network_repo

You may look here: http://svnbook.red-bean.com/en/1.0/re16.html

Answer 2

Araixs合并工具最适合此类问题，您可以将更改和检入合并到主干中