Better Merge Tool for Subversion [closed]

C

7

58

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

Cereus answered 8/9, 2008 at 18:32 Comment(2)

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 – Hotel 5/4, 2012 at 7:29

@KrisErickson: Hello Sir, could you possibly help me out with my question here ? Thank you ... :) – Unknown 23/3, 2016 at 5:57

V

32

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.

Vallonia answered 8/9, 2008 at 18:50 Comment(0)

M

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

Mithraism answered 8/9, 2008 at 18:41 Comment(2)

While looking quite nice, this is thing weighs in at 90MB! – Cankered 22/12, 2015 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! – Intrauterine 13/4, 2018 at 12:15

V

32

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.

Vallonia answered 8/9, 2008 at 18:50 Comment(0)

A

22

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

Albarran answered 8/9, 2008 at 19:3 Comment(2)

I can't recommend this enough with just an upvote. – Elyn 18/5, 2012 at 13:20

@Nate Why is that? – Amygdalin 13/6, 2019 at 14:15

E

6

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

Emylee answered 8/9, 2008 at 18:44 Comment(1)

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) – Junina 17/2, 2011 at 15:34

E

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.

Elative answered 8/9, 2008 at 18:50 Comment(0)

P

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.

Recommended topics

Hot tags