iPhone版本控制工具（颠覆）
我已经使用 iPhone SDK 和工具几个月了。 Xcode 看起来相当不错，但有一个工具我没有得到：FileMerge。如何使用它来比较文件或进行合并？
现在说真的，你真正使用什么？
我的用例是远程服务器上的subversion数据库，很少有本地开发人员从事同一项目，也很少有远程开发人员。不能分别给每个人打电话/交谈来询问他们做了什么，必须有可用的文件/文件夹差异/合并工具。寻找与 Xcode 很好集成的图形版本控制前端。
我自己更喜欢Beyond Compare，多年来一直是快乐的用户，但它不适用于Mac OS X 还没有。
I've used iPhone SDK and tools for several months. Xcode seems pretty nice, but there is one tool which I don't get: FileMerge. How can anyone use it for comparing files or doing merge?
Seriously now, what do you really use?
My use case is subversion database on remote server, few local developers working on same project as well as few remote developers. Cannot call/talk each person separately to ask what did they do, must have usable file/folder diff/merge tool. Looking for graphical version control front-end, which integrates nicely with Xcode.
I would prefer Beyond Compare myself, been happy user for years, but it wasn't available for Mac OS X yet.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（4）
我知道您可能正在寻找基于 XCode 的答案/解决方案。但这就是我所做的：
每次我必须进行合并时，我都会启动 Eclipse ，它有一个很好的 SVN 插件 可以很好地进行合并。如果您对 Eclipse 平台有一定的经验，那么设置它不会有任何问题。否则，您可能需要阅读一些有关如何在 Eclipse 平台上安装插件的文章。
希望有帮助。
I know you are probably looking for a XCode based answer/solution. But here is what I do:
Everytime I must do a merge, I launch Eclipse which has a nice SVN plugin that will do merges decently. If you have some experience in Eclipse platform you will have no problems in setting this up. Otherwise, you might want to do a little bit of reading on how to install plugins on Eclipse platform.
Hope it helps.
虽然我更喜欢使用 tkdiff 进行双向合并，但有几个特别适用于 mac 的实用程序：
还有一个通用的 有关三向合并工具的问题。
Although I prefer tkdiff for two-way merge, there are several utilities available especially for mac:
And there is a generic question about three-way merge tools.
我使用 FileMerge 已经有一段时间了，但它不是很好，我同意。
现在我使用我推荐的 Changes。
如果您使用 SVN，我还强烈推荐 Versions 作为 SVN 客户端。
I got by with FileMerge for a while but it's not great, I agree.
Now I uses Changes, which I recommend.
If you're using SVN I'd also highly recommend Versions as an SVN client.
我们暂时选择了 SmartSVN。我经验丰富的同事检查了几个 Mac 应用程序，并根据其合并功能选择了其中一个。尽管如此，还是感谢您的建议！
We chose SmartSVN for now. My more experienced colleague checked several Mac apps and chose that one based on its merge feature. Thanx for recommendations nevertheless!