How can I get WinMerge to keep left and right?

merge winmerge
NotDan picture NotDan · Jul 14, 2009 · Viewed 7.8k times · Source

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?

Answer

ProKiner picture ProKiner · Jul 14, 2009

Check out KDiff3... best free three-way merge tool out there.

Related questions

Use WinMerge as TortoiseHG Merge tool

I am trying to set up WinMerge as the Merge tool into TortoiseHG; Here is my Mercurial.ini: ; User specific Mercurial config file. ; See the hgrc man page for details. [ui] username = Bargio <> merge = winmergeu [extdiff] cmd.winmerge = …

Read More
How do I merge two dictionaries in a single expression in Python (taking union of dictionaries)?

I have two Python dictionaries, and I want to write a single expression that returns these two dictionaries, merged (i.e. taking the union). The update() method would be what I need, if it returned its result instead of modifying …

Read More
Git pull a certain branch from GitHub

I have a project with multiple branches. I've been pushing them to GitHub, and now that someone else is working on the project I need to pull their branches from GitHub. It works fine in master. But say that someone …

Read More