I'm using SVN/Tortoise as code repository for my projects. When merging different branches I often encounter conflicts on (Microsoft Visual Studio) resource files; this happens easily if a dev adds a resource on a branch and another in trunk, for instance.
I always managed this kind of conflicts using "use theirs then mine" button in TortoiseMerge tool, the one that opens when trying to resolve conflicts.
During last years it seems to me that this function (the whole "use" thing) is getting relegated in secondary places: at first they put all the options under a drop down button and more recently I have to right-click on the preview pane to access it (no more button in the ribbon).
Now I wonder if I'm using the tool the wrong way: I mean, isn't "use" the main purpose of TortoiseMerge? If so, why all the other functions have more visibility and are more accessible than the only one I use?
Another option is that something is wrong with the "block" ribbon button, because it's always disabled in my experience.
0 comments:
Post a Comment