Better Merge Tool for Subversion

Question

Is there a good external 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 the three way merge (maybe a better question would be is there a way to force tortoisesvn to merge like tortoisecvs?)

[Edit]

After trying all of them, for me, the SourceGear is the one I prefer. The way to specify the DiffMerge from sourcegear is:

C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe /t1="My Working Version" /t2="Repository Version" /t3="Base" /r=%merged %mine %theirs %base

Diffmerge user interface is optimized to base file shown in the middle so the correct turtoiseSVN commands is: sgdm.exe /t1="Mine" /t2="Base" /t3="Their" /r=%merged %mine %base %theirs — Alex Burtsev, Apr 05 '12 at 07:29
@KrisErickson: Hello Sir, could you possibly help me out with my question [here](http://stackoverflow.com/q/36157555/3287204) ? Thank you ... :) — Yash Sampat, Mar 23 '16 at 05:57

Alistair Sutherland · Answer 1 · 2017-05-18T12:05:38.967

46

Perforce Merge Tool

Even though Perforce is obviously not free the merge tool is. It's 100x better than the default TortoiseSvn one. To integrate with TortoiseSvn set the merge tool to:

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

edited May 18 '17 at 12:05

answered Sep 08 '08 at 18:41

Alistair Sutherland

1,381
13
10

While looking quite nice, this is thing weighs in at 90MB! – zb226 Dec 22 '15 at 15:51
During install deselect the other options/clients: `Helix Visual Client, Administration Tool and Command-Line Client` and only install the `Merge and Diff Tool` ....and besides: what is 90 MB nowadays? After 10mins getting used to it, this tool is really helpful! – Lonzak Apr 13 '18 at 12:15

score 32 · Accepted Answer · edited Feb 17 '16 at 16:49

Take a look at Sourcegear DiffMerge. DiffMerge is the compare and merge tool from their Vault and Fortress products, but they make it available for free as a standalone tool. One noteworthy feature is that it allows diffing of entire directory trees.

Edit: While DiffMerge remains a free tool, it nags for registration with a popup at least once a day (since at least version 4.2). It also states in the popup:

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

score 22 · Answer 3 · answered Sep 08 '08 at 19:03

22

Beyond Compare has been suggested a number of times to me.

answered Sep 08 '08 at 19:03

3

I can't recommend this enough with just an upvote. – Nate Parsons May 18 '12 at 13:20
@Nate Why is that? – Gaurav Jun 13 '19 at 14:15

score 6 · Answer 4 · answered Sep 08 '08 at 18:44

6

I use KDiff3 as a 3-way merge tool. It does a decent job.

answered Sep 08 '08 at 18:44

Erin Dees

1,677
2
13
21

It really can do a decent job and has a nice clean interface. I use it as a merge tool with TortoiseSVN and it can almost always fix my conflicts automatically. (I've seen things like Conflicts: 450; Automatically resolved: 448) – jbvo Feb 17 '11 at 15:34

score 6 · Answer 5 · answered Sep 08 '08 at 18:50

6

Araxis Merge is expensive, but great. Handles 3 way merges on files or folders really well. I find the way it displays diffs much more helpful than Windiff or P4's tool.

answered Sep 08 '08 at 18:50

Jurney

382
3
8

score 3 · Answer 6 · answered Sep 08 '08 at 18:34

3

CompareIt is good, I find using the command line interface for svn, that it merges more for me, where tortoise picks up on things and asks you.

answered Sep 08 '08 at 18:34

DevelopingChris

39,797
30
87
118

score 0 · Answer 7 · answered Jan 21 '13 at 00:19

0

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

answered Jan 21 '13 at 00:19

manuc66

2,701
29
28

Better Merge Tool for Subversion

7 Answers7

Linked