How to use svn merge two branch

Sometime in development, you need tag your source code into two branch (one for trunk to continue develop, one for delivery - hot fix, etc...). In the case hot fix branch is stable and you need merge it into trunk. Here is the step your need to do with SVN command line.

Step 0: You have a working copy of destinate branch in your local or checkout it to local.

Step 1: cd (working copy path)

Step 2: use svn commit to commit all change from your local

Step 3: use svn update to update all change from branch to your local

Step 4: use

svn merge --reintegrate \ {srcbranchURL}

to integrate from Source Branch to your local.

Step 5: compile,build,test your local to make sure it work ok.

Step 6: svn commit to commit merged code to your destinate branch

@In case you want to merge on branch to trunk, the destinate branch URL is the trunk URL