Using the TFS merge tool, I can click on the left side and the right side to keep both changes/conflicts. This is needed when I add a method and another team member adds a method in the same place and I need to keep them both. In WinMerge (file merge, not folder), it seems that I can only overwrite the right with the left. Is it possible to make WinMerge copy the left to the right, and keep the right?
A:
Yes, you need to go into the file comparison window (by double-clicking on an entry in the folder comparison window) which will show groups of differences (lines in the files). In this window, you can move stuff between left and right any way you want, using the toolbar buttons or keys (Alt-Left, Alt-Right, Alt-Up, Alt-Down).
Vinay Sajip
2009-07-14 17:15:37
This is what I was doing, but the problem is that when you move Left to Right, the Left will OVERWRITE the Right... and I don't want to have to do that, I want to add the Left to the Right, and keep the Right also...
NotDan
2009-07-14 20:43:41
Vinay Sajip
2009-07-14 21:04:03
A:
I think you're looking for Merge capability. I've seen it in TortoiseMerge but not in WinMerge (though there may be some way to do it). Can you simply copy-and-paste manually from one side to the other?
Jon
2009-07-14 20:52:13
A:
The simple answer is no - you're almost asking it to read your mind. Instead, WinMerge opens both files up in a full text editor, and it illustrates the discrepancies while you do the copy and pasting.
Greg
2010-04-19 13:47:50