SVN合并工具 [英] Tools for SVN Merging

问题描述

SVN合并非常耗时(尤其是在大型代码库上)，并且容易出错. Eclipse和Netbeans插件不能很好地为我服务.目前，我正在使用手动"svn merge"和图形化差异生成的组合.有更好的选择(非win32)吗?

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 Meld. Are there better alternatives (non-win32)?

推荐答案

实际上，有报道称人们使用git-svn或hg-svn桥来下载树，执行合并，然后上传合并.不能解决混乱的部分，但是合并的速度提高了，从而减少了繁琐的工作.

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.

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