External git merge on OS X

External git merge on OS X:

The default merging behavior of git is pretty good – until it blows chunks and litters your merged file with dozens of >>>> markers. I had this happen to me again this weekend, and was finally motivated to do something about it.

[snip]

sudo port install xxdiff
git config –global merge.tool xxdiff

Now files needing a merge will open in the xxdiff user interface – which is an ugly XWindows thing, but it’s powerful. I’d love to see git hook up to something like Araxis Merge or Changes (when their 2.0 version with 3-way merge comes out), but I’m not nearly motivated enough to hack around in the git source yet.

[I’m not happy with ports. Each attempt leaves me with a mess I have to clean up myself. Any other solutions?]
Source: A Fresh Cup – Home

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Google photo

You are commenting using your Google account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s