Merge tool: resolve using complete file (source/base/destination)
In many cases when I merge branches, an xml documentation file happens to be one that needs user intervention (a manual merge). Because this file is automatically generated by Visual Studio, its content order is random. What's more, it is usually quite large and even several hundred sections in it may need user intervention.
I don't actually care about the content of that file, because it will be automatically generated correctly when I rebuild the project after merging the branches. So I just click 'Save and exit' without changing anything.
When I do that, the application asks me an extra question whether I really want to continue. Because of that I often wonder if this is a correct way to solve problems like this.
Would you consider adding an option to the merge window, for selecting the complete source, base or destination file as is, as the merge result? Just like it can be done for binary files that can't be merged.
Mariusz Schimke
shared this idea
-
Mariusz Schimke
commented
That's true, but I rarely use it. I usually click the 'Process all merges' button only, and then wait for feedback.
I just wanted you to consider an improvement in the merge tool, but if you think it is unuseful, you can close this topic.
Thanks for your response.
-
You actually have this option already on the merge window in Plastic. Not in mergetool, but it is there on the context menu before you launch the merge.