配置：获取git数据，然后将其与git mergetool合并

Question

I've successfully set up Kaleidoscope as my default git difftool, and works like a charm. But when I make a fetch then git difftool, I can see what has changed, yet I cannot choose or merge what I want (at least not through Kaleidoscope).

Now, I want to set up File Merge (the Merge app bundled with XCode) as my mergetool so I can fetch, see what has changed, and choose what to merge.

Is this possible? If so, how can I set this up?

My apologies in advance for a noobish question.

Answer 1

I use SourceGear's DiffMerge application for merging. It's much better than opendiff (the Xcode merge tool), and that's my recommendation for you. You can use the principles below to configure opendiff instead if you really want to, but it's much less powerful than DiffMerge.

My global git config file contains:

[mergetool "diffmerge"]
        cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
        trustExitCode = false
[merge]
        tool = diffmerge

So now when there are merges to do, I say "git mergetool" and it'll prompt me to launch DiffMerge for each file that needs merging. I can choose from all the options for the file, save it into a resolved file, and go. It's very nice.