Originally posted by Chengwei Lee:
Hi Jeanne,
I actually have both Subclipse & TortoiseSVN, but I'm missing the link on how to do the merging of bug fixes from release branches into my trunk. Any help on that?
we normally use command line tool to do the merging.
If you have taken the release branch at rev: 100 from trunk and if your
current revision is 200, then the command would be as follows:
svn merge -r100:200
http://yourrepo/releasebranch .
. refers to the current checkout folder of trunk folder.
Tortoise also has the option of merge context menu.
Did you try that?
Regards
Vijay