Solved

Need a Diff/Merge tool for SourceTree on Mac Lion

Posted on 2012-04-13
4
3,091 Views
Last Modified: 2012-04-15
I use Git, SourceTree and Xcode on a Mac Lion machine. But I think I need an "External Diff" tool. I will also most certainly need a Merge tool as well.

What can you suggest? I prefer free, but would pay a little for a tool that's pretty nice, and has proven reliability.

Thanks.
0
Comment
Question by:newbieweb
  • 2
  • 2
4 Comments
 
LVL 33

Assisted Solution

by:pgnatyuk
pgnatyuk earned 500 total points
ID: 37845877
I think BBEdit is the tool you are looking for:
http://www.barebones.com/products/bbedit/index.html?utm_source=thedeck&utm_medium=banner&utm_campaign=bbedit

You can check diffmerge:
http://www.macupdate.com/app/mac/25426/diffmerge
http://sourcegear.com/diffmerge/downloads.php

Maybe, the easiest way is to use opendiff from the Xcode package. Type in Terminal:
opendiff my_file1.m my_file2.m
It's in Xcode.app/Contents/Developer/usr/bin in you have the latest Xcode. (You may need to launch:
sudo /usr/bin/xcode-select -switch /Applications/Xcode.app/Contents/Developer)
before for Xcode 4.3).

In Xcode you find FileMerge tool too: in the main menu Xcode->Open Developer->File Merge
The app is in Xcode.app/Contents/Applications
0
 

Author Comment

by:newbieweb
ID: 37846310
I do not see how to do diff and merge using BBEdit, but I see lots of references to is in the wiki.

Have you used BBEdit? If it works for me, I'd pay $49.99 for it.
0
 
LVL 33

Accepted Solution

by:
pgnatyuk earned 500 total points
ID: 37846769
Of course. I use BBEdit more than 2-3 years.
In the menu there is Search->Find Differences.
Then, you choose what you want to compare. In case of the folders, you'll see all differences and select each one separately.
The menu item
You can use Xcode, FileMerge is not bad.
0
 

Author Closing Comment

by:newbieweb
ID: 37848384
Thanks!
0

Featured Post

Free Tool: Site Down Detector

Helpful to verify reports of your own downtime, or to double check a downed website you are trying to access.

One of a set of tools we are providing to everyone as a way of saying thank you for being a part of the community.

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

What's a UDID? If you're involved in developing, testing, or even reviewing an iOS application that's in beta, then at some point you may need to know the UDID for any iOS devices that you'll be testing on. What's the UDID? It stands for Unique Dev…
Do you come here a lot? Are you lazy like me and don't want to go through the "trouble" of having to click your Dock's Safari icon and then having to click your Experts Exchange Favorites bookmark to get here? Well then this article is for you.
This Micro Tutorial hows how you can integrate  Mac OSX to a Windows Active Directory Domain. Apple has made it easy to allow users to bind their macs to a windows domain with relative ease. The following video show how to bind OSX Mavericks to …
When you create an app prototype with Adobe XD, you can insert system screens -- sharing or Control Center, for example -- with just a few clicks. This video shows you how. You can take the full course on Experts Exchange at http://bit.ly/XDcourse.

830 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question