Well what I initially wanted it for was when I migrated a project to Subversion. I had two projects, one of which was the trunk and the other was essentially a branch, and since I had "branched" I had made code changes to both copies - and I wanted to use the Merge function with conflict resolution on every file to get all of the changes into one project/trunk. I've now merged them manually so I now don't need to do this, but thanks for the command anyway - it may come in handy in the future! I've also learned a bit more about Subversion workflow so I'm now working more efficiently.
Cheers Alex On Jun 28, 9:28 pm, jeroenh <[email protected]> wrote: > I don't know whether TortoiseSVN supports this in one way or another, > but the native subversion (command line) client's merge command has an > option that would probably do what you want: "svn merge --diff3-cmd > ARG". > > My first question however would be why would you want to work like > this? It seems like a lot of work for a scenario that is rather rare > to me... > > The alternative would be to selectively undo the changes you want to > loose (either right before or right after an automatic merge/update > operation). > > greetz, > jeroen > > On 28 jun, 15:16, Alex <[email protected]> wrote: > > > 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
