Best Merge Tool for Subversion

Question

Is there any good merge tool for tortoisesvn (I don't particularly like the built-in Merge tool). I use WinMerge for diffs, but it doesn’t work with triangular merging (maybe the best question is is there a way to get tortoisesvn to merge like tortoisecvs?)

[change]

Having tried everything for me, SourceGear is the one I prefer. The way to specify DiffMerge from sourcegear:

C: \ Program Files \ SourceGear \ DiffMerge \ DiffMerge.exe / t1 = "My working version" / t 2 = "Repository version" / t 3 = "Base" / r =% combined% mine% theirs% base

Answer 1

Check out Sourcegear DiffMerge . DiffMerge is a comparing and merging tool from their Vault and Fortress products, but they make it available for free as a standalone tool. One of the notable features is that it allows you to distinguish whole directory trees.

Edit: While DiffMerge remains a free tool, it is recorded with a pop-up menu at least once a day (at least since version 4.2). It also indicates in a popup window:

Choosing new features in future releases will also require registration, but major features and fixes will be available to everyone.

Answer 2

Perforce Merge Tool

Although Perforce is obviously not a free merge tool. It is 100 times better than the standard TortoiseSvn. To integrate with TortoiseSvn, install the merge tool:

C: \ Path-To \ P4Merge.exe% base% theirs% mine% merged

Answer 3

Beyond Compare has been suggested several times to me.

Answer 4

I use KDiff3 as a 3-sided merge tool. This is a decent job.

Answer 5

Araxis Merge is expensive but excellent. Handles of 3 sides merge strongly with files or folders. I find that it displays diffs much more useful than a Windiff tool or P4.

Answer 6

CompareIt well, I find using the command line interface for svn that it brings together more for me, where the turtle picks up things and asks you.

Answer 7

I like this SmartSynchronize , which is free for non-commercial use.