blocks|key|3151345|text|实际上，有报道说人们使用git-svn或hg-svn桥来下载树，执行合并，然后上传合并。不会解决混乱的部分，但合并速度的提高使其变得不那么繁琐。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3151346|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Actually there are reports of people using git-svn or hg-svn bridges to download a tree, preform a merge, then upload the merge. Doesn't solve the messiness part but the increased speed of the merge makes it less tedious.

blocks|key|5407128|text|Meld可以说是最好的工具之一，也是非Win32最常用的工具之一。无论是在Windows上还是在Wine上，WinMerge都能轻松取胜。Linux的一些替代方案：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|5407129|5407130|Kompare|unordered-list-item|5407131|KDiff3|5407132|DirDiff|5407133|5407134|附注:实际上，在Windows上，TortoiseSVN合并工具也能给出很好的结果:)|5407135|entityMap|0|LINK|mutability|MUTABLE|url|http://winmerge.org/|1|http://www.caffeinated.me.uk/kompare/|2|http://kdiff3.sourceforge.net/|3|http://freshmeat.net/projects/dirdiff/^0|1I|8|0|0|0|0|7|1|0|0|6|2|0|0|7|3|0|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@$A|13|B|14|1|15]]|C|$]]|$1|D|3|-4|5|6|7|16|8|@]|9|@]|C|$]]|$1|E|3|F|5|G|7|17|8|@]|9|@$A|18|B|19|1|1A]]|C|$]]|$1|H|3|I|5|G|7|1B|8|@]|9|@$A|1C|B|1D|1|1E]]|C|$]]|$1|J|3|K|5|G|7|1F|8|@]|9|@$A|1G|B|1H|1|1I]]|C|$]]|$1|L|3|-4|5|6|7|1J|8|@]|9|@]|C|$]]|$1|M|3|N|5|6|7|1K|8|@]|9|@]|C|$]]|$1|O|3|-4|5|6|7|1L|8|@]|9|@]|C|$]]]|P|$Q|$5|R|S|T|C|$U|V]]|W|$5|R|S|T|C|$U|X]]|Y|$5|R|S|T|C|$U|Z]]|10|$5|R|S|T|C|$U|11]]]]

Meld is arguably one of the best and one of the most used tools for non-win32. On Windows or with Wine <a href="http://winmerge.org/" rel="noreferrer">WinMerge</a> wins hands down. Some alternatives for Linux:

<ul>
<li><a href="http://www.caffeinated.me.uk/kompare/" rel="noreferrer">Kompare</a></li>
<li><a href="http://kdiff3.sourceforge.net/" rel="noreferrer">KDiff3</a></li>
<li><a href="http://freshmeat.net/projects/dirdiff/" rel="noreferrer">DirDiff</a></li>
</ul>

P.S. Actually on Windows the TortoiseSVN merge tool gives great results too :)

blocks|key|3151559|text|我最近开始使用新的Beyond+Compare+3+(适用于Windows和Linux)。它似乎始终比TortoiseSVN或KDiff3做出更好的自动化合并决策。尤其是在空格方面，我相信这是由于BC3s更好的文件类型配置。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3151560|我也认为它的合并界面比KDiff更清晰，更容易理解。|3151561|entityMap|0|LINK|mutability|MUTABLE|url|http://scootersoftware.com/^0|9|G|0|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]]|C|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|C|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|C|$]]]|G|$H|$5|I|J|K|C|$L|M]]]]

I have recently started using the new <a href="http://scootersoftware.com" rel="noreferrer">Beyond Compare 3</a> (for Windows and Linux). It seems to consistently make better automated merge decisions then TortoiseSVN or KDiff3. Particularly on whitespace, I believe this is due to BC3s better file type configuration. 

I also think its merge interface is cleaner and easier to understand then KDiff.

blocks|key|3996579|text|我学会了如何使用SvnMerge，这是一个Python脚本，并取得了相当大的成功。你可以在谷歌上搜索我在我的博客上发布的说明，或者给我写一条信息，我会把这个虚荣的链接贴出来。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3996580|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I figured out how to use SvnMerge, which is a Python script(s), and had quite a lot of success with it. You can google for the instructions I put on my blog, or drop me a line and I'll post the vanity link.

blocks|key|3151455|text|我真的很喜欢Sourcegear+Diffmerge。http://www.sourcegear.com/diffmerge/|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3151456|entityMap|0|LINK|mutability|MUTABLE|url|http://www.sourcegear.com/diffmerge/^0|R|10|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

I really like Sourcegear Diffmerge. <a href="http://www.sourcegear.com/diffmerge/" rel="nofollow noreferrer">http://www.sourcegear.com/diffmerge/</a>

blocks|key|3996911|text|在我的工作中，我们一直使用TortoiseSVN。合并从来没有任何问题，所以我也可以推荐它。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3996912|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

We have always used TortoiseSVN on my work. Never had any problem with the merge so I can also recommend it.

blocks|key|3997022|text|我用过svnmerge，它帮了我很多。它是一个命令行实用程序，所以它可能不是对每个人都最好的工具，但它对我来说很好。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3997023|entityMap|0|LINK|mutability|MUTABLE|url|http://www.orcaware.com/svn/wiki/Svnmerge.py^0|3|8|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

I've used <a href="http://www.orcaware.com/svn/wiki/Svnmerge.py" rel="nofollow noreferrer">svnmerge</a> and it helps a lot. It's a command line utility, so it may not be the best tool for everyone, but it's good for me.

blocks|key|3151434|text|您在哪个平台上运行？在Windows上，我使用TortoiseSVN非常容易地执行大多数差异和合并。只有一些更复杂的diffs链是用UltraCompare执行的。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|3151435|entityMap^0|N|B|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

Which platform are you running on? On Windows I use TortoiseSVN to carry out most diffs and merges pretty easily. Only some of the more complicated strands of diffs are performed with UltraCompare.

blocks|key|5407533|text|我目前在Linux上找到的最好的工具是submerge中的submerge。Here是如何使用它并与eclipse集成的。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|5407534|entityMap|0|LINK|mutability|MUTABLE|url|http://lifeinide.com/post/2011-08-06-edit-conflicts-in-eclipse-using-submerge/^0|12|4|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

Best tool I've currently found for Linux is submerge from subcommander package. <a href="http://lifeinide.com/post/2011-08-06-edit-conflicts-in-eclipse-using-submerge/" rel="nofollow noreferrer">Here</a> is how to use this and integrate with eclipse.

blocks|key|832777|text|我已经创建了开源控制台工具来自动化合并过程。我认为它可以对其他人有所帮助：Merger|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|832778|它可以：|832779|832780|将文件夹中的子文件夹切换到将来合并的新难度(提交/更改的文件数/提交到相同文件的数量，按项目)|unordered-list-item|832781|+merge+revision+by+revision+in+auto模式，直到项目组的|832782|批量合并没有冲突。|832783|832784|从理论上讲，它应该能够与单声道一起工作。|832785|entityMap|0|LINK|mutability|MUTABLE|url|https://merger.codeplex.com/^0|11|6|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@$A|Z|B|10|1|11]]|C|$]]|$1|D|3|E|5|6|7|12|8|@]|9|@]|C|$]]|$1|F|3|-4|5|6|7|13|8|@]|9|@]|C|$]]|$1|G|3|H|5|I|7|14|8|@]|9|@]|C|$]]|$1|J|3|K|5|I|7|15|8|@]|9|@]|C|$]]|$1|L|3|M|5|I|7|16|8|@]|9|@]|C|$]]|$1|N|3|-4|5|6|7|17|8|@]|9|@]|C|$]]|$1|O|3|P|5|6|7|18|8|@]|9|@]|C|$]]|$1|Q|3|-4|5|6|7|19|8|@]|9|@]|C|$]]]|R|$S|$5|T|U|V|C|$W|X]]]]

I have created open source console tool to automate merging process. I think it can helpful for other peoples: <a href="https://merger.codeplex.com/" rel="nofollow">Merger</a> 
It can: 
 - Switch subfolders in the folder to the new branch 
 - Calculate difficulty of the future merge (number of commits/changed files/ commits to the same files, by project) 
 - Merge revision by revision in auto mode, until no conflicts 
 - Bulk merge of the groups of projects. 
In theory it should be able to work with mono.

SVN merging is very time consuming (especially on large code bases) and error prone. Eclipse and Netbeans plugins don't serve me very well. At the moment I'm using a combination of manual "svn merge" and the graphical diff <a href="http://meld.sourceforge.net/" rel="noreferrer">Meld</a>. Are there better alternatives (non-win32)?

Tools for SVN Merging

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

SVN合并非常耗时(尤其是在大型代码库中)，而且容易出错。Eclipse和Netbeans插件不能很好地为我服务。目前，我使用的是手动"svn merge“和图形化比较的组合。是否有更好的替代方案(非Win32)？

问SVN合并工具
EN

回答 10

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问SVN合并工具EN

回答 10

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问SVN合并工具
EN