Xcode 4 + Git - 对我有用吗?
我一直在寻找一个像样的视觉差异工具来进行 git 差异和合并,但从未找到一个既好用又稳定的工具...我注意到 Xcode 4 现在内置了 git,所以想知道如何才能做到这一点两者都用于我的工作。
所以问题 1)
我只做 Web 开发,不做 OSX 或 iOS 应用程序...但是有没有办法我可以利用 Xcode 来使用他们的视觉差异工具?
问题2)
在没有意识到git被捆绑的情况下,我安装了Xcode(因此Homebrew可以工作),然后使用“brew install git”单独安装了git。我现在已经加倍了吗?我需要删除我用 Homebrew 安装的吗?
问题 3)
由于我没有注意到的任何原因,Xcode 对我有用吗?它对于项目处理或其他什么有什么用处吗?
非常感谢:)
I've always searched for a decent visual diff tool for git diffs and merges and have never found one that is both great to use and stable... I've noticed that Xcode 4 has git built in now so was wondering how I could use both for my work.
So question 1)
I only do web dev, no OSX or iOS apps... but is there a way I can tap into Xcode to use their visual diff tool maybe?
question 2)
Without realising git was bundled, I installed Xcode (so Homebrew works) then installed git separately with "brew install git". Have I now doubled up and do I need to delete the one I installed with Homebrew?
question 3)
Would Xcode be any use to me for any reasons that I haven't noticed? would it be any use for project handling or anything?
Many thanks :)
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
1) Xcode 附带了自己的三向合并工具:/Developer/Applications/Utilities/FileMerge.app/ 我在 Xcode 中使用过的 Git 不多,但我敢打赌,这是他们用来进行差异/合并的工具。
2) 你加倍了,但不用担心,很多时候人们会安装 OS X 提供的工具的较新版本(只要确保不要覆盖 OS X 提供的工具即可。)
3) 如果你不使用 OS X /iOS 开发,我认为 Xcode 不太适合你。在我看来,Xcode 中的编辑器还有很多不足之处。
我的两分钱。 :)
1) Xcode ships with with its own three-way merge tool: /Developer/Applications/Utilities/FileMerge.app/ I haven't used Git in Xcode much but I bet that's the tool they use for doing diff/merging.
2) You doubled up but don't worry about it, many times people will install newer versions of OS X supplied tools (just make sure not to overwrite the one supplied by OS X.)
3) If you're not doing OS X/iOS development, I don't see Xcode being that good for you. The editor in Xcode leaves a lot to be desired in my opinion.
My two cents. :)