How to re-integrate a branch in tortoiseSVN

Question

I have finally successfully created and worked in a branch. I have commited my changes to the branch. Now I want to re-integrate the work in the branch into the main working trunk. How do I do that in tortoiseSVN?

Answer 1

First thing, if there are more changes committed in trunk after you created the branch, then merge those changes into your branch (this is called rebase). Once that is done, you can re-integrate branch into trunk.

Otherwise after re-basing the branch from trunk you can do simple merge-revision option("Merge a range of revisions") as well.

If changes you made are not so big and there is very less changes into trunk also then you can also create patch for you changes in branch and then apply them to trunk. But I would suggest to do the proper merge.