Merge branch with trunk

Question

Using TortoiseSVN, I need to take changes I\'ve done in a branch and then merge them with trunk.

I am the only developer on this project, so I know trunk hasn\'t chang

Answer 1

I am using TortoiseSVN 1.9.3, Build 27038.

Follow below steps in order to merge branch into trunk.

1) Right click on trunk working copy and select the below option.

2) In case of Branch Merging into trunk select option second as shown below and click next

3) In the From: field enter the full folder URL of the trunk. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes. In the To: field enter the full folder URL of the feature branch.

4) Click next and do the test merge

5) If test merge is successful then click on Merge button.

6) Once merge is successful then commit the changes on trunk.