Merging of SVN Branch trunk

First, the trunk merge to the branch

First, in the local trunk of the first update, there is conflict resolution conflict, ensure that the trunk and repository are fully synchronized, and then right-click on the/branches/myproject, select "TortoiseSVN", then "Merge ", select the first item" merge a range of revision "in the pop-up window, and this type of merge is for merging multiple revision that are committed on a branch or main line onto another branch.

After clicking Next, the following window appears:

Because it is to be merged from the trunk to branch, it is natural that the "URL to merge from" should be the path of the trunk, "Revision range to merge" very well understood, Is that you want to merge which revision of the trunk into the branch, which can be a series of revision, such as 4-7,15-head, or a separate revision number (which can be selected after clicking the Show Log window). Of course we can also choose all revisions to represent all revisions. After clicking Next, the following image appears:

Just leave the default settings here. Before you click the merge button, you can test the merge to see if it's successful or not, and the details of the merge. When you click the Merge button, the trunk changes are synced to branch.

At this point, Branch has been fully synchronized with the trunk, merging occurs in the local working copy, as long as you do not commit will not affect the repository. So we and the merge operation, after dealing with the conflict (if there is a conflict), commit the code to repository. Ii. Branch merging to Trunk

Right-click on the/trunk/myproject (note the right-click on the main Line's directory), then select "TortoiseSVN", then "Merge ...".
Follow up and branch merge to trunk, you can actually understand the trunk as a branch "main branch".
because we merge branches into branches is usually after the branch development is finished, so in general choose all revisions, of course, if you want to merge only part of the trunk, you can choose specific revisions specify the version number merge.