更好的 Subversion 合并工具 [英] Better Merge Tool for Subversion

问题描述

tortoisesvn 有没有好的外部合并工具(我不是特别喜欢内置的合并工具).我将 WinMerge 用于差异，但它不适用于三路合并(也许更好的问题是有没有办法强制 tortoisesvn 像 tortoisecvs 一样合并?)

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?)

在尝试了所有这些之后，对我来说，SourceGear 是我更喜欢的一个.从sourcegear指定DiffMerge的方法是:

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

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

推荐答案

看看 Sourcegear DiffMerge.DiffMerge 是来自他们的 Vault 和 Fortress 产品的比较和合并工具，但他们将其作为独立工具免费提供.一个值得注意的特性是它允许比较整个目录树.

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.

虽然 DiffMerge 仍然是一个免费工具，但它每天至少会通过弹出窗口进行注册(至少从 4.2 版开始).它还在弹出窗口中说明:

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.

这篇关于更好的 Subversion 合并工具的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！