|
I used to like the one that came with subversion...
|
|
|
|
|
SourceGear | DiffMerge[^] has been my weapon of choice for the last 12 or 14 years.
Did you ever see history portrayed as an old man with a wise brow and pulseless heart, weighing all things in the balance of reason?
Is not rather the genius of history like an eternal, imploring maiden, full of fire, with a burning heart and flaming soul, humanly warm and humanly beautiful?
--Zachris Topelius
|
|
|
|
|
we use an old version of araxis merge.
CI/CD = Continuous Impediment/Continuous Despair
|
|
|
|
|
Depending on my current workflow. When it comes to standalone tools, Beyond Compare is my eternal love but in most cases, I'm using the built-in diff view of Visual Studio.
|
|
|
|
|
Btw, I don’t use a separate diff tool much these days as I’m usually running SublimeMerge which is a super fast Git GUI with built-in diff/merge.
Again, I bought my own licence because its too tedious trying to justify a work purchase.
|
|
|
|
|
it is good to know this new tool for me![Rose | [Rose]](https://codeproject.global.ssl.fastly.net/script/Forums/Images/rose.gif)
diligent hands rule....
|
|
|
|
|
kdiff3 (if no-one else has mentioned that yet). It's the dog's.
Paul Sanders.
Not that the story need be long, but it will take a long while to make it short - Henry David Thoreau
Some of my best work is in the undo buffer.
|
|
|
|
|
I use UltraCompare
It is not free.
It has some nice options:
Binary compare
3-way compare
Folder compare
PDF, Word, Zip compare
Table compare
|
|
|
|
|
Another vote for UltraCompare - not terribly expensive, UltraEdit is awesome on its own.
Three-way compare is helpful in the few times it's needed.
|
|
|
|
|
I use WinMerge now. Previously have used WinDiff and KDiff3 in the past.
So long as there is good keyboard support for merging and the ability to edit a line on the go, I'll be happy to use it.
|
|
|
|
|
WinMerge, does diff, 3 way merge, and can do a split view of a single file conflict that's spat out from git
|
|
|
|
|
I've been using good old WinDiff since 1997, and I still like it. Sometimes I also use Tools.DiffFiles in the Visual Studio Command Window.
|
|
|
|
|
I've found Source Gear DiffMerge quite good. Think it costs money though... I can't remember.
|
|
|
|
|
|
ExanDiff Pro - fast, reliable, customizable, really good at merging when needed
|
|
|
|
|
I've been using Beyond Compare from Scooter Software for more than 13 years and use it many times everyday. It is very powerful, flexible, and can be as simple or as complex as you like.
I generate many configuration files used to deploy Azure Resources and Policies using automation scripts to a temp folder and compare that to the Git Repo folders on my local PC using the directory and file compare features in Beyond Compare. It's very easy to quickly identify the differences and locate potential issues when changing the automation scripts. When everything is correct, I can then run the scripts against the Local Master Repo, commit, merge, and trigger pipeline deployments.
I also use it to help with migration to a new PC, for locating differences when hunting for a file from restored backups, for comparing CVS data files, etc...
I could not do my job as effectively if using other Directory and File compare and merge tools and is worth every penny.
|
|
|
|
|
good info to me!
diligent hands rule....
|
|
|
|
|
BeyondCompare is highly rated by my coworker and he made me install it.
|
|
|
|
|
Beyond Compare 4 is by far my favorite. I have used several over the years with varying results but BC4 is accurate and can be configured specifically for different applications.
The free version these days has a 30 days(usage days) license, plenty of time to get used to it and its afforable besides.
|
|
|
|
|
I have been using Beyond Compare for over 2 decades. Nothing else has ever compared  to it.
Scooter Software: Home of Beyond Compare
Cheers,
Mike Fidler
"I intend to live forever - so far, so good." Steven Wright
"I almost had a psychic girlfriend but she left me before we met." Also Steven Wright
"I'm addicted to placebos. I could quit, but it wouldn't matter." Steven Wright yet again.
|
|
|
|
|
in summary, more people used Beyond Compare and I would like to give a try.
diligent hands rule....
|
|
|
|
|
I've been using <a href="https://sourcegear.com/diffmerge/">SourceGear Diffmerge</a>[<a href="https://sourcegear.com/diffmerge/" target="_blank">^</a>] for many years now. It's free and it works well on Windows, Linux and OSX. It will compare either files or folders of files.
|
|
|
|
|
diffuse for simple file comparisons, merging.
winmerge for dirs and word docs +.
both free.
no code integration.
modified 14-Jun-22 10:45am.
|
|
|
|
|
Visual studio's, since it's right there always.
In the command window (View>Other Windows>Command window) type Tools.DiffFiles <filepath1> <filepath2>
|
|
|
|
|
Retired now but I used the JDiffPlugin in JEdit (my favorite text editor). The editor is very configurable and has a ton of plugins available. The JDiffPlugin was very well integrated with the editor.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
