|
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.![Rose | [Rose]](https://codeproject.global.ssl.fastly.net/script/Forums/Images/rose.gif)
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.
|
|
|
|
|
For Windows users => I've used all the free ones and while they are great, Araxis Merge is hands down the best I've used so far. Note I haven't used Beyond Compare because I didn't know it existed until just now. It looks like it has even more features and is cheaper, so I might consider changing at my next upgrade.
In the mean time yes Araxis Merge costs, but as a professional it's what I need and it's not in the thousands of dollars range - also I only need to worry about the upgrade price.
I love the interface and going between folder comparison to file comparison, the white noise handling options. And I love the keyboard shortcuts to speed up processing of big changes. 3 way comparisons. I've submitted feature requests, which have implemented - so that's awesome. One not so obvious feature is image comparison - very cool!
And I really love the line between the chunk of codes that's different, so that you can scroll each side independently and not be forced into the merge tool trying to line it up for you and getting lost.
My single biggest complaint with Araxis Merge is the purchasing / payment / upgrade path is clunky. To upgrade you have to email your request - why? Working in Sydney means my upgrade takes minimum 1 day to get a response and that's before payment and downloading? It's truly annoying if you run into problems and all you want to do is just do a merge. Fortunately in the whole 10 years of ownership it has only happened once, when I've been without Araxis Merge for a few days. But still - it would be nice if they simplified this process.
modified 19-Jun-22 16:59pm.
|
|
|
|
|
very valuable sharing to me
diligent hands rule....
|
|
|
|
|
I've used a lot over many years and most are pretty good, some excellent.
I currently rely on Deltawalker because I do a lot of work on MacOS.
|
|
|
|
|
I'm not sure where to pose this question, as it's not exactly a programming question but I'm looking for APIs that can return weather information, and I was wondering if any of you have ones that you've used that you can recommend? I want something with an easy to digest api (no SOAP for example, and no complex auth) and free so that I can use it in my IoT project.
Also it should be easy to specify gps cordinates or something for getting local weather.
To err is human. Fortune favors the monsters.
|
|
|
|
|
|
|
Thanks! I just subscribed to that one and it looks great! The only problem is now I need to get GPS coords for an IP and the service I've found (geoIp) is pay to play. It's not the cost, but the fact that this is a demo project. I'd like to keep things free instead of per request.
To err is human. Fortune favors the monsters.
|
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
