Solved

Need a Diff/Merge tool for SourceTree on Mac Lion

Posted on 2012-04-13
4
3,056 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
Comment Utility
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
Comment Utility
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
Comment Utility
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
Comment Utility
Thanks!
0

Featured Post

Highfive + Dolby Voice = No More Audio Complaints!

Poor audio quality is one of the top reasons people don’t use video conferencing. Get the crispest, clearest audio powered by Dolby Voice in every meeting. Highfive and Dolby Voice deliver the best video conferencing and audio experience for every meeting and every room.

Join & Write a Comment

Syslogd is a utility that traps and logs messages sent by running processes. It is configured with the syslog.conf file, which consists of lines containing a pair of fields: "the selector field which specifies the types of messages and priorities to…
In this article we will discuss some EI Capitan Mail app issues and provide some manual process to resolve them.
It is a freely distributed piece of software for such tasks as photo retouching, image composition and image authoring. It works on many operating systems, in many languages.
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.

728 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

Need Help in Real-Time?

Connect with top rated Experts

9 Experts available now in Live!

Get 1:1 Help Now