Note to Self, Easy Merging With TortoiseSVN
Posted in Tech stuff on October 6th, 2009 by Martin Schapendonk – Be the first to commentMy usual day doesn’t involve a lot of technical stuff, but once in a while I happen to enjoy an evening with editors and revision control systems. Once in a while is not often enough to memorize all tips and tricks about branching, tagging, merging and working copies.
I used to use the TortoiseSVN -> Merge dialog for merging changes from trunk to a branch. I find this dialog quite… confusing. What source? What revisions? Yesterday evening I found an easier solution for this. I decided to put it up here, I’m sure I’ll need it again someday. And perhaps there are some people out there that might find this helpful as well.
I assume an up-to-date working copy, all changes committed, no conflicts with the repository.
Right click trunk, pick TortoiseSVN -> Show log. Select the revision(s) you want to merge, right click and choose Merge. Pick a folder in your working copy to merge to, click OK, and presto, done.
Piece of cake. Do Not Forget This Anymore.
