Home/ Questions/Q 6723929
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-26T09:37:40+00:00

I’ve always searched for a decent visual diff tool for git diffs and merges

  • 0

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 🙂

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    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. 🙂

    • 0