Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the 'base' revision) and support graphical tools to resolve conflicts. Better search tool for mac mail.
Active4 months ago
What tool do you use? Windows, Mac OS X, Linux, free or commercial, you name it.
Code Compare is a free compare tool designed to compare and merge differing files and folders. Code Compare integrates with all popular source control systems: TFS, SVN, Git, Mercurial, and Perforce.
Here's a few that I've used or heard of, just to get the conversation started:
(I recognize that this is sort of like the Best Diff Tool, but it's different in that I explicitly focus on three-way merge tools; WinMerge is off the list, for example.)
Dan FabulichDan Fabulich
16.5k3232 gold badges102102 silver badges140140 bronze badges
closed as not constructive by casperOneApr 11 '13 at 11:36
As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for guidance. If this question can be reworded to fit the rules in the help center, please edit the question.
13 Answers
KDiff3 open source, cross platform
Same interface for Linux and Windows, very smart algorithm for solving conflicts, regular expressions for automatically solving conflicts, integrate with ClearCase, SVN, Git, MS Visual Studio, editable merged file, compare directories
Its keyboard-navigation is great: ctrl-arrows to navigate the diffs, ctrl-1, 2, 3 to do the merging. Free download paint tool sai for mac.
Also, see https://stackoverflow.com/a/2434482/42473
Just checked out P4merge since I heard about it in another blog article:
Very slick interface, and FREE! I've been a faithful Araxis Merge user, but considering this is free and awesome, I'd encourage you to check it out.
Jean-Bernard Pellerin
10.8k88 gold badges5050 silver badges7373 bronze badges
Dan EsparzaDan Esparza
20.2k2525 gold badges8989 silver badges124124 bronze badges
Beyond Compare 3 Pro supports three-way merging, and it is a pretty impressive merge tool. It's commercial (but worth it, IMHO) and is available on Windows, Linux, and Mac OS X.
As pointed out in a comment, it's also inexpensive. Free website mockup tools.
Note: If one does not have a merge set, that is, merge markers resident in the destination file, Beyond Compare does not offer three-way file compare/editing. Beyond Compare says that feature is on their list.
Note: 3-way merge is a feature in the Pro edition of Beyond Compare 3 only
Brian
7,22277 gold badges3131 silver badges4343 bronze badges
Joshua McKinnonJoshua McKinnon
21.9k88 gold badges5151 silver badges5959 bronze badges
I have had only good experiences working with Meld. I use it when I have to do messy code merges between branches. It is simple to use and has a clean interface.
In Ubuntu, install is as simple as: Jonathan Mee
sudo apt-get install meld
23.1k1010 gold badges7373 silver badges184184 bronze badges
ElijahElijah
9,25488 gold badges4848 silver badges8787 bronze badges
vimdiff. It's great. All you need is a window three feet wide.
Ciro Santilli 新疆改造中心996ICU六四事件
168k3636 gold badges646646 silver badges518518 bronze badges
Paul BeckinghamPaul Beckingham
11.7k44 gold badges2626 silver badges6464 bronze badges
Source Gear Diff Merge:
Cross-platform, true three-way merges and it's completely free for commercial or personal usage.
Dan Esparza
20.2k2525 gold badges8989 silver badges124124 bronze badges
CMS
![]()
627k166166 gold badges860860 silver badges819819 bronze badges
Araxis Merge. It is commerical, but it is so worth it.. It is available for Windows and the Mac OS X.
Peter Mortensen
14.4k1919 gold badges8888 silver badges117117 bronze badges
DaveDave
Kdiff3 conflict resolution algorithm is really impressive.
Even when subversion indicates a conflict, Kdiff3 solves it automatically. There's versions for Windows and Linux with the same interface. It is possible to integrate it with Tortoise and with your linux shell.
It is in the list of my favorite open source software. One of the first tools I install in any machine.
You can configure it as the default diff tool in Subversion, Git, Mercurial, and ClearCase. It also solves almost all the ClearCase conflicts. In Windows, it has a nice integration with windows explorer: select two files and right click to compare them, or right click to 'save to later' a file, and then select another one to compare.
The merged file is editable. Has slick keyboard shortcuts.
You can also use it compare and merge directories. See:
An advanced feature is to use regular expressions for defining automatic merges.
My only annoyance is that it is a little difficult to compile if it isn't present in your favorite distro repository.
I love Ediff. It comes built-in with GNU Emacs.
To do a three-way diff, use
ediff-files3 (for selecting three files) or ediff-buffer3 (for selecting three already-open buffers). You'll get a screen looking like this:
Note the word-difference higlighting.
You can hit unhammer
n or p to go to the next/previous diffs, while ab will copy the region from buffer a (the leftmost one) to buffer b (the middle one), and similarly for other two-letter combinations of a , b , c ; rb will restore the region in buffer b. Hit ? for a quick help menu, or read the fine manual on diff3 merging in Emacs.
2,24511 gold badge2525 silver badges3535 bronze badges
Git Merge Tool Macjcrossley3jcrossley3
9,91844 gold badges2626 silver badges3232 bronze badges
Ultracompare. It is really good, handles large files (more than 1 GB) well, is available for Windows/Mac/Linux, and it's commercial, but it is worth it.
Mofi
31.2k88 gold badges4242 silver badges9191 bronze badges
MrTellyMrTelly
Diffuse is an easy to use three-way merge tool. It supports all of the platforms and version control systems you mentioned, and it can compare more than three files at the same time.
Jordan Ryan Moore
6,43722 gold badges2222 silver badges2727 bronze badges
Derrick Moser
Peter Mortensen
14.4k1919 gold badges8888 silver badges117117 bronze badges
Mark HarrisonMark Harrison
182k104104 gold badges282282 silver badges406406 bronze badges
I wrote a review of some merge tools a while back that may be useful: http://www.misuse.org/science/2007/02/24/3-way-merging/
The summary is that I found ECMerge to be a great, though commercial product. http://www.elliecomputing.com/products/merge_overview.asp
Code Merge Tool For Mac
I also agree with MrTelly that Ultracompare is very good. One nice feature is that it will compare RTF and Word docs, which is handy when you end up programming in word with the sales guys and they don't manage their docs correctly.
Dan Esparza
20.2k2525 gold badges8989 silver badges124124 bronze badges
Steve MidgleySteve Midgley
1,76911 gold badge1515 silver badges2020 bronze badges
Not the answer you're looking for? Browse other questions tagged version-controlmergedvcs or ask your own question.
Active8 months ago
Is there a way that I can set on Mac the Visual Studio Code as the default diff/merge tool in SourceTree?Thank you in advance.
ozzottoozzotto
54522 gold badges1010 silver badges2727 bronze badges
2 Answers
According to the docs I found, SourceTree just uses whatever you've configured your git repo to use.
You can configure your git repo to use VS Code with the
git config command like so:
However, you must configure VS Code to launch from the terminal before this will work.
See this blog for more info.
JDBJDB
17.8k44 gold badges5555 silver badges9999 bronze badges
I found this with instructions on how to get it to work on the Mac. I wasn't able to get it to work until I used the full path to the code executable (I also set code in my global path)
Itool For Mac
bcrbcr
Not the answer you're looking for? Browse other questions tagged gitmacosvisual-studio-codeatlassian-sourcetree or ask your own question.Comments are closed.
|
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |