In the long list of suggestions a couple of developers mentioned the native " opendiff " tool from OS X, otherwise named "FileMerge". I don't know much about diffmerge but it was mentioned too in the list. This name - Araxis Merge - reminds me of a time long ago when I was working on a locked down Windows machine trying to survive a sea of XML files madness and the tool proved to be up to the challenge. It's a commercial tool. Several colleagues use vimdiff to solve conflicts.
You can set it up by typing:. How do you solve conflicts? What is your flow? Do you use any other tool than the ones mentioned? Let us know your tricks, ping me at durdn or my awesome team at atlassiandev. You might also enjoy our ebook, "Hello World! A new grad's guide to coding as a team" — a collection of essays designed to help new programmers succeed in a team setting.
Grab it for yourself, your team, or the new computer science graduate in your life. Even seasoned coders might learn a thing or two. Read it online now. Click here to download for your Kindle. General setup tips Let's start with a simple set of basic configuration toggles to setup Git properly for merges.
Setup tips When you have a conflict, you can initiate your merge sessions from the command line typing " git mergetool " or from a visual tool. Show common ancestor in conflict markers Use the following setting to improve the conflict markers to show also the common ancestor Thanks Robin Stocker and Hugh Giddens: Use the "patience" algorithm in merges If you have lots of conflicts in a long piece of content like an XML file or when two versions have diverged a lot, try merging again using: When you need information on the history of a single file Barring using a visual tool like SourceTree to find out what happened to a file you can use: Sample process Several colleagues shared their manual process, for example Jason Hinch reported his flow: Start with the merge at hand: For each conflicting file: As a long-time WinMerge user I was very happy with it.
Its use of little gem-like icons in a 3-way merge takes some getting used to. One icon is for my change, one for their's, and one for the common ancestor.
Once you get that straight it was very helpful. However, these restrictions only make sense when using their server-side software. These client-only tools can't really be licensed like that. I'll update if I ever hear back from the company on this matter. There's an application called SemanticMerge for Mac.
It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems. Here's a screenshot. The original website for Meld is here http: Thank you! If you don't need the power of a dedicated Diff tool application, the integrated diff views in Tower might be absolutely sufficient for you:. Jonny Jonny 4 14
SemanticMerge, as the name says: I am a Mac user attached to elegance and esthetics as a significant factor in productivity for cognitive reasons. A fully native and elegant Human Interface is for me of paramount importance. I tried many contenders Araxis, P4Merge and many others.
Being part of its developer toolset, Apple's own merge tool comes at no who did a great job in making it one of the best diff & merge tools for the Mac. 3 days ago Meld is freely available on Linux, Windows and OSX (through MacPorts, Fink or Brew). It's also open source and distributed under the GNU.
I purchased several. I loved Changes for a long while. Now my favorite is Kaleidoscope. It provides 3-way merge, it can compare images in a smart way, it has a slick and elegant interface. When an application claims to be cross-platform, that rings an alarm bell. More often than not, it means an ugly, non-native interface.
Having to cringe when working is not my idea of having fun at work. Installation information can be found in: I use VisualDiffer.
It is promising. Changes - http: We're looking for long answers that provide some explanation and context. Don't just give a one-line answer; explain why your answer is right, ideally with citations. Answers that don't include explanations may be removed. My favorite free solution for merging the contents of files is KDiff3.
KDiff3 can do two-way and three-way merges, has a decent GUI and has some pretty powerful features to assist with the merge. I haven't made my choice for Mac.
Meld does work on OS X and Windows, but there are no all-in-one packages for those systems available at the moment. Home Questions Tags Users Unanswered. What's a good Mac equivalent of WinMerge?
Warren Pena Warren Pena 1, 3 15 Read more about locked posts here. Duplicate of: But both are no way close to WinMerge. FileMerge is nothing close to WinMerge. I've never found a diff tool that I like nearly as much and DiffMerge is so ugly I wanted to claw my eyes out when I tried it. The only time I've seen behavior such as you're talking about is when it's dealing with newline incompatibilities.
I've found the following applications: DiffMerge Pretty Diff Open sourced beautifier and language aware code comparison tool for many languages. Meld Can be installed using Homebrew via command: Araxis Merge Commercial with free trial.
See also: Comparison of file comparison tools at Wikipedia for the full list. What file comparison tool can I use under OS X?
Portable, free, cross-platform, GUI-based prose-friendly plain-text diff and merge tool? Code compare and merge tool for Mac OSX. I would upvote this one a few times if I could. Never knew that TextWrangler could compare files. Pieter So you've to install XCode then as per error. Check this or Google the issue. Michael H. DiffMerge is not as good as Windiff. Features Two- and three-way comparison of files and directories File comparisons update as you type Auto-merge mode and actions on change blocks help make merges easier Visualisations make it easier to compare your files Supports Git, Bazaar, Mercurial, Subversion, etc.
Meld 3. The 3. If you experience issues, please use Meld 3. Hosted by GitHub.