How can I get WinMerge to keep left and right?
https://stackoverflow.com/questions/8757579
italiano
english
français
española
中国
日本の
العربية
Deutsch
한국어
Português
RussianQuestion
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?
Solution
Check out KDiff3... best free three-way merge tool out there.
OTHER TIPS
No, but you can type on the right side and also copy and paste from the left side to the right side.
Diffuse does a marvelous job of that. Don't know what Greg is talking about.
What Andrew said is actually quite helpful. I can't imagine that the desired functionality not be in WinMerge, but if not, copy left and right all that you can normally, then manually copy/paste the rest to get both sides identical how you want them. You can refresh after making these manual changes to see the status.
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?
I had the same problem and found that Guiffy cand merge changes from both file A and file B.
There's a button where you can apply this kind of merging to all the differences.
Check this help page to find out how to keep both changes.
Although not free, you can use it for free for 21 days. More than enough for my one time need.
I had this problem, but I found out that one of the files (the one of the left) was Read-only. This meant I couldn't copy anything from right to left.
From the File menu, there are options to disable or enable Read-only attribute of either file. Have them both unchecked will allow you to copy in either direction.
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).
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.
