Hi All, This may be a very simple thing to do, but as I am new to VisualSVN and Subversion in general I thought I'd ask it here. Is it possible, when merging a branch back into the trunk, to see a TortoiseMerge window for every file merge that occurs? I have tried merging using the 3 different methods and each time, when a file merge occurs, the merge is handled automatically and I cannot choose which text blocks to use from "my" copy and "their" copy. What I have done is to create a trunk project with two buttons on a Windows Form, and two short pieces of code in the Button.Click event handler for each. I have then created a branch from the trunk and deleted one of the buttons and its Button.Click code. Also, I added some more code to the remaining button's event handler code. When I go to merge the branch back into the trunk I would like the additions of code to be included in the merge result, but the deletions of code to be ignored - leaving me with both buttons and event handlers present, and with the extra code on one of the event handlers. I figured that I'd have to use TortoiseMerge during the merge operation to make this happen, but I haven't found a way for it to be summoned up during the merge operation.
Anyone know how I can use TortoiseMerge for every file merge that takes place? Thanks Alex
