The 5 Best Mac File Comparison Tools and Diff Tools

https://static1.makeuseofimages.com/wordpress/wp-content/uploads/2021/06/meld-diff-and-merge-tool-latest.png

Writers and programmers often need to compare different versions of the same code or text to keep track of changes. However, figuring out the changes is not a simple task. As a document gets longer, you’re more likely to make errors in comparison.

A file comparison tool helps you compare and merge differences between two (or more) versions of the same file. There are different types of utilities, each tailored for specific types of file formats.

We’ll look at some best file comparison and difference (diff) tools for macOS.

1. Meld


Meld is a simple, cross-platform diff and merge tool. The user interface is intuitive and neatly packs all its functions into a handy menu. It has many customizable settings to make file comparison quick and easy.

On first launch, the app gives you an option to choose a comparison module. To start a comparison, click the File module and select your files from Finder.

Meld will display them side-by-side. Any differences between them appear highlighted to make individual changes easier to see.

On either side of the panels, you’ll see two vertical bars with colored blocks. They give you a bird’s-eye view of all changes, such as inserted, deleted, changed, or in conflict. Click the arrows in a segment to copy or merge a block of one file with another.

Meld’s Unique Features:

  • Three-way comparison of files. The changes update in real-time, no matter how big the file gets.
  • Integrates with source control systems, such as Git, Bazaar, Mercurial, and SVN to perform version control tasks. The built-in version filter helps you compare any changes to the local vs repository file.
  • The text editor supports line numbers, whitespace, syntax highlighting, and text wrapping for a user-friendly experience.
  • With text filters, you can ignore text that matches a particular pattern or even use regular expressions to create complex filters. To try them, go to Preferences and turn on Text Filters.

Download: Meld (Free)

2. Helix P4 Diff and Merge Tool


Helix P4V is a cross-platform, enterprise version control software used to compare and merge source files, web pages, manuals, OS code, and more. P4V is the client for the Helix core server that hosts all your data and resides in a depot. You open the files and edit them in your workspace.

When done, submit the modified file back to the shared repository or depot, where it keeps track of all the file revisions. P4V integrates with the P4 diff and merge tool. The purple icon and its color scheme highlight the input file, while the green icon and its color scheme highlight the output file.

P4Merge displays files side-by-side, with the center as a base file. This allows you to compare two files with a base file to find differences and select the text you want in the merged file. To navigate, click the Previous or Next buttons.

Helix P4’s Unique Features:

  • Works with image formats including PNG, GIF, JPG, and others. It highlights identical areas in gray and differences in yellow in both images. You can also compare file resolution, depth, and size.
  • The integration with P4V can reveal the entire file revision history, plus what changed during a particular time frame. This is useful for resolving bugs.
  • Visualize the differences and resolve conflicts that result from parallel or concurrent development via color-coding, syntax highlighting, line numbers, and patches.
  • Supports syntax highlighting for source code while comparing or merging files. Click the Show Syntax Highlighting button to toggle the feature.
  • View image revisions sequentially in time-lapse view. In here, you can see an image file’s history, like who made changes and when.

Download: Helix P4 Diff and Merge (Free for five users and 20 workspaces)

3. Beyond Compare


Beyond Compare is a comprehensive utility to compare and merge various file types and folders. The app tries to maintain a balance between features and performance with an easy-to-use interface and colorful buttons. On first launch, choose the comparison module for Text, RTF, Hex, MP3, Tables, and more.

Every comparison task begins with a Session. You can customize and save any session as Workspace. Simply load the workspace, and Beyond Compare will also load all your sessions with the same configuration and tabs.

The app will display your files side-by-side. It uses red text for highlighting important differences and blue for insignificant changes. You can adjust these colors to suit your preferences.

The overview thumbnail on the left pane displays a visual map of colors. To navigate, use the Next and Previous buttons to step through all your differences. Then, use the arrow buttons to merge your files. Click the Save button located at the right of the window to save your file.

Beyond Compare’s Unique Features:

  • The Session settings that control these comparisons are called Rules. They put you in control of how each session works and helps you discover significant differences.
  • The Table Compare session compares text files with tabular data. You can sort and align the data on key fields and compare them cell-by-cell.
  • Built-in scripting processing feature to automate routine tasks. For more details, visit the scripting section of the Help page.
  • Integration with popular tools like SQL Examiner, Dreamweaver, EditPlus, Total Commander, and Version Control System.
  • Compare files in remote storage through Dropbox, Google Drive, Amazon S3, and OneDrive.

Download: Beyond Compare ($30 Standard | $60 Pro | Free trial available)

4. DeltaWalker


DeltaWalker is a cross-platform visual diff and merge tool. The interface is intuitive, with just a few menu buttons. It relies more on visual parameters to help you find differences. Out of the box, it supports Office files, Java archives, ZIP, XML, PDF, and more. Speaking of which, we’ve covered how to compare two Excel files using other methods.

Click the Browse button in the entry field to bring up a File Open dialog box. On the other side, you can either open a local or remote file via SFTP, HTTPS, WebDAV, Dropbox, or Google Drive.

The app uses colors to denote the changes in blocks as inserted, deleted, changed, and in conflict. You’ll see connecting lines that joins together related blocks to simplify the results.

The vertical color strip on the right panel shows a summary with a scaled-down visual map of all differences. Click the arrow button (which appears when you hover your mouse) to merge your files.

DeltaWalker’s Unique Features:

  • One-click integration with Git, Bazaar, Mercurial, and SVN. Go to Preferences > SCM Integration and toggle the SCM of your choice. Here’s a guide on how to install Git on Mac.
  • Find and Replace feature helps you find specific characters and use regular expressions for advanced cases. Or use shortcuts to access them without opening the Find and Replace window.
  • Linked undo and redo feature keeps track of changes across editors. When you undo, the changes happen in reverse order, spanning across multiple editors.
  • Export the file comparison report as HTML and Patch. The latter contains the differences between one or more pairs of different files, which is helpful for app developers.

Download: DeltaWalker ($40 Standard | $60 Pro | Free trial available)

5. Araxis Merge


Araxis Merge is a complex diff and merge tool. It works with many file formats, including Office files, PDF, XML, HTML, Binary, and source code files. This makes the app suitable for various creative professionals and use cases.

Click the Browse button to open your file. Araxis Merge uses text extraction filters and formatting tools to help you see changes more clearly. Go to Preferences > File Comparisons > File Types to configure the filters for various kinds of files.

Thin overview strips next to the scroll bar show the position of changes. The status bar shows you a summary of changes that are inserted, removed, changed, and deleted. The built-in plugin system gives you access to files located in Git, SVN, and Perforce Depot.

There are two layout options: vertical and horizontal. They both work with two- and three-way file comparison modes. Use the Previous or Next buttons (or shortcuts) to navigate through the file. Additionally, click the small merging button on each block to copy, replace, or merge files.

Araxis Merge’s Unique Features:

  • Drag and drop blocks of text in either panel to edit files. Araxis Merge analyzes the changes in the background and saves them. At any time, you can undo the result.
  • Compare folders with two- or three-way file comparison. This layout splits the display with folders on top and its related files at the bottom.
  • Create markers to indicate the lines you’ve modified. Add a bookmark to remind yourself or place a comment to note important information.
  • The synchronization link feature can help you identify points of similarity between files to simplify the comparison results. This works best with complex files.
  • Export the file comparison report as HTML, XML, and Unix Diff. This feature is helpful for future audits, storage, and sharing.

Download: Araxis Merge ($129 Standard | $269 Pro | Free trial available)

Use Notepad++ to Compare Files

There are many reasons to use a file comparison tool. A software developer might need syntax highlighting and export features. A writer may prefer a more visual diff tool to compare text. The apps discussed here cover every use case. Give them a proper trial to see which one fits your needs.

If you’re using the excellent text editor Notepad++, then you can compare files easily with a plugin. It’s feature-rich and fits both casual users and programmers.

MUO – Feed

Comic for July 04, 2021

https://assets.amuniversal.com/ef5645f0a0e201396138005056a9545d

Thank you for voting.

Hmm. Something went wrong. We will take a look as soon as we can.

Dilbert Daily Strip

Military-style gun confiscation hits a snag!

https://www.buckeyefirearms.org/sites/buckeyefirearms.org/files/styles/slideshow/public/field/image/Gun%20Pile.jpg?itok=0S9sTixg

by Gary Evens

The efforts of officials to confiscate military-style firearms in Massachusetts ran into trouble recently when armed militia groups confronted a government raid to seize a stockpile of guns and ammunition and arrest leading anti-government activists rumored to be in a small town outside of Boston.

The government forces were initially met by a small number of militia members in Lexington. After their show of force, the militia leader ordered his men to stand down and allow the government’s troops to pass. They were in the process of dispersing when a shot rang out. No one is sure just who fired that shot, but in response government troops opened fire, killing eight and wounding several others before their officers could regain control of the situation. Government forces then proceeded west towards their original destination of Concord, Massachusetts.

At Concord, the government troops spread out through the community searching for banned goods and the individuals they had been instructed to arrest. One group headed toward William Barret’s farm where it was reported that a stockpile of guns and ammunition was being collected. Meanwhile, some prohibited items were found in the town and set on fire in a vacant lot. However, the fire soon spread to a nearby building and the resulting smoke led some militia leaders that had assembled their men in the area to believe the town was being deliberately burned down. They began advancing and confronted a group of government troops at a bridge on the north side of the town. A brisk exchange of gunfire resulted in about a dozen casualties and government forces retreating back towards the center of town.

At this point, the raid’s leaders decided it would be best to return to Boston rather than continuing on their mission. During the subsequent retreat, an estimated seventy troops were killed and about two hundred were wounded as thousands of militiamen from the area rushed to confront the retreating government forces.

Following the abortive raid, an investigation was launched into why it had failed. The raid had been planned in the utmost secrecy, with the troops and leaders learning of their mission only at the last possible moment. Still word leaked out, probably by someone that overheard the planning of the raid at the governor’s mansion. Knowledge of the potential raid quickly spread to militia leaders but the exact target of the raid was not known. The individual that leaked the information about the raid was never identified.

This most recent raid was part of a trend that started last year when a law was passed banning the importation of military-style firearms and ammunition into the state. Subsequently, government forces began conducting warrantless searches for guns and ammunition. A successful raid was conducted on September 1, when a stockpile of ammunition was seized from a site about six miles northwest of Boston. A similar effort to seize ammunition stockpiles occurred in Williamsburg, Virginia. Rumors quickly spread that the government was deliberately trying to deny citizens the ability to acquire ammunition. Hoarding and shortages soon followed.

These initial successful efforts led the Massachusetts and Virginia governors to order further raids. A second attempt to seize illegal guns and ammunition was aimed at the Salem community. This one failed when local citizens learned of the raid and took efforts to block roads and bridges, preventing government officials from reaching the town.

Gun control efforts in Massachusetts increased in response to protests in Boston resulting from raising taxes and harsh treatment by government officials. This latest series of protests turned violent a few years ago when government officials opened fire on a crowd, killing five, including one black man. A couple of years later another group of protesters seized control of an embargoed shipment of goods pending payment of import taxes. Although the protest was non-violent, several thousand dollars in goods were destroyed. In an effort to restore order, Massachusetts’ governor imposed martial law in the area immediately around Boston and ordered the confiscation of firearms and ammunition.

In response to the governor’s action, Massachusetts gun rights leaders pointed to a resolution that was voted on almost ten years ago that stated every citizen was entitled to possess a firearm for their own personal protection and to defend the state from outside attack. They said that the government’s latest efforts fly in the face of long-standing tradition that people have the right to defend themselves.

[Author’s Note: You probably have not heard about these incidents in any of the major news outlets. However, they all happened, just not recently. Instead they occurred in the late eighteenth century and involved the events surrounding the Boston Massacre (1770), the Boston Tea Party (1773), and the Battles of Lexington and Concord (1775). Even then, gun control was used in an attempt to control the rights of citizens to protest government actions.]

Buckeye Firearms Association

Why We Love Thermacell

https://cdn.thewirecutter.com/wp-content/media/2021/06/52-things-thermacell-2048px-0115-3×2-1.jpg?auto=webp&quality=60&width=630&dpr=2

Why We Love Thermacell

I hate bugs.

I hate them so much that when my husband suggests having dinner outside or playing a lawn game, I immediately start to wonder about the swarms of mosquitoes that will attack me.

How about a card game inside instead?

But ever since we started using Thermacell devices, I have happily said yes to the outdoors more often.

Wirecutter: Reviews for the Real World

Comic for July 01, 2021

https://assets.amuniversal.com/2f2280d0b1d401396577005056a9545d

Thank you for voting.

Hmm. Something went wrong. We will take a look as soon as we can.

Dilbert Daily Strip

Couple Builds $30K Garage for $6K, Using Prefab Quonset Hut Manufacturer

https://s3files.core77.com/blog/images/1197497_81_109313_WaOdEJNif.jpg

After years of living in NYC, Jean and Joe moved to Minneapolis, where they could afford to build a house. But one thing that wasn’t in their budget was the freestanding garage required by local housing ordinances. They took bids from contractors, and the price for building a garage from scratch came in at $30,000. Their story was captured by Fair Companies in the video below.

To summarize the garage story: After doing some research, Jean found a company in Canada that manufacturers Quonset huts to custom sizes. While she doesn’t mention the company by name, I looked at several fitting that description and believe they went with Mississauga-based Metal Pro Buildings.

MPB cranks out prefabricated sheet metal arches to whatever dimensions you need. They’re shipped to you in pieces, and all you need to do is bolt each arch together, stand them up, bolt them to each other, then bolt the end pieces on.

By going with the prefabricated Quonset hut approach and DIY assembly, Jean and Joe paid just $6,000, versus the $30,000 cost of a stick-built garage. (One thing they don’t mention in the video is the cost of the concrete slab, which they apparently did have in their budget.)

While the "shotgun"-style layout dictated by their plot seems inconvenient, I’m amazed that you can get a two-car garage for six grand. If you’re seeking a similarly cheap outbuilding, you can check out MPD’s different Quonset models (it looks like Jean and Joe went with the S-Series, but there are five styles total) here.

Core77

Another Recall: Herter’s 9mm Lots Added to List of Defective Ammo

https://www.thefirearmblog.com/blog/wp-content/uploads/2021/06/hr1-180×180.jpg

On the heels of a recent Winchester and Browning-branded 9mm recall, now certain lots of Herter's ammo have been added to the list.TFB recently reporting on the announcement of a safety recall for certain lots of Winchester and Browning 9mm ammunition. The 115-grain rounds in question, manufactured for these brands in East Alton, Illinois by the Olin Corporation, are subject to a factory defect causing the powder to burn improperly. This can cause what is known as […]

Read More …

The post Another Recall: Herter’s 9mm Lots Added to List of Defective Ammo appeared first on The Firearm Blog.

The Firearm Blog

How to Build Your Own Rain Barrel

https://i.kinja-img.com/gawker-media/image/upload/c_fill,f_auto,fl_progressive,g_center,h_675,pg_1,q_80,w_1200/3f215c88231ce9686e4b107e68becf22.jpg

My sustainable homestead is evolving—and the new addition to the ever-growing project involves using rain barrels to provide my chickens with drinking water, irrigate my garden, and keep my compost pile moist.

Luckily for me, my local municipality teamed up with our state college to offer residents classes and incentives to help grow our community’s conservation effort (you can check with your local government to see if they offer anything similar). Through the program, I was able to purchase a 55-gallon rain barrel for just $37—a deal so good I opted to purchase three barrels. The barrels were guaranteed to be food-grade, which meant I avoided the toxic residuals that might have been lurking in any old barrel. Instead, my barrel had been used exclusively to store juice, so it was actually designed to withstand both the pressure and weight of 55 gallons of liquid, which weighs roughly just under 500 pounds.

The sweet juice residuals meant I needed to clean the barrel out with a solution, though. You can use a solution of one ounce of bleach to five gallons of water or, as I did, opt for a vinegar and baking soda alternative. However you get the job done, you’ll want to make sure the barrel is fresh and clean before you start collecting water in it.

Here are a few things I’ve learned throughout the process:

  • You don’t need a water pump to get the water out if you use gravity to your advantage and place the barrel on a raised base.
  • You want your base to be level and balanced.
  • 55 gallons of water is very heavy.
  • You’ll need to use fine mesh as a barrier at every entry point you create; otherwise, debris can clog everything up, and bugs are attracted to the water.
  • It’s important to avoid placing your barrel in direct sunlight because algae will grow inside it. You can also paint your barrel to keep the light out.

The build itself is rather simple: Rain barrels have inlets into which you direct a water source—you can direct the water from your gutter system by modifying your downspout to pour directly into the inlet, for example. Add another hole toward the top of the barrel for overflow and plan to direct that water away from your foundation—or into another barrel.

Next, you’ll need to cut a hole toward the bottom of the barrel and install a spigot. From the spigot, you can use a garden hose to direct the water to wherever you want it to go. How high you place the barrel will determine how much pressure you are going to get.

G/O Media may get a commission

   

Lifehacker

How Tennis Rackets Are Made

http://img.youtube.com/vi/YVs-Suu-ljE/0.jpg

How Tennis Rackets Are Made

Link

Yonex is one of the most respected brands in tennis, and their rackets are the choice of many pro players. Tennis Warehouse takes us inside the Japanese company’s warehouse for a look at their production process, which seamlessly blends a human and robotic workforce.

The Awesomer

MySQL in a Docker Container cheat sheet

Here’s a cheat sheet to run MySQL in a Docker container in your Windows or Mac laptop in a few minutes. In this brief how-to you will:

  1. Install Docker Desktop in your laptop
  2. Download official Oracle MySQL image or Docker Inc. image
  3. Start the container
  4. Administer it
  5. Start a MySQL session and start a Linux session

Download and install Docker

You can download Docker Desktop for Windows or Mac from https://docs.docker.com/desktop/. Install like any other application and you’re ready to move to the next step. As you can read from the docs, Docker Desktop will install several things like Docker Compose or Kubernetes. We’ll use both in advanced examples in future posts.

Pull MySQL Server image

Now you can pull the MySQL Server image. You have two options. You can download the image maintained by Oracle MySQL (find the description here https://dev.mysql.com/doc/refman/8.0/en/linux-installation-docker.html)

docker pull mysql/mysql-server:latest

Or you can download the image maintained by Docker Inc. You can find a description together with examples here: https://hub.docker.com/_/mysql

docker pull mysql 

The differences? Oracle MySQL image runs over Oracle Linux, whereas Docker Inc. image runs over Debian. And if you have a MySQL subscription, you will get Support for the Oracle MySQL Docker image if in trouble.

List Docker images

You can list the brand new MySQL image here. Pay attention to the IMAGE ID field, you will need it (I have downloaded both images, Oracle MySQL and Docker Inc. in the following output).

docker images
REPOSITORY           TAG       IMAGE ID       CREATED       SIZE
mysql                latest    5c62e459e087   6 days ago    556MB
mysql/mysql-server   latest    1504607f1ce7   6 weeks ago   391MB

Start a MySQL image in a Docker container

You can start the container, and choose a:

  • A name for the container (mysql_cnt in the example)
  • The root password
  • The image you want to launch
docker run --name=mysql_cnt -e MYSQL_ROOT_PASSWORD="Password1*" --restart on-failure -d 5c62e459e087

Find additional information to configure the instance in the corresponding image documentation, shared before.

Verify that the container has started normally

Make sure the container is up.

docker ps -a
CONTAINER ID   IMAGE          COMMAND                  CREATED         STATUS         PORTS                 NAMES
30f6e1462b9e   5c62e459e087   "docker-entrypoint.s…"   4 minutes ago   Up 4 minutes   3306/tcp, 33060/tcp   mysql_cnt

Troubleshooting

If the container has not started, you can check logs. In this case, all is working.

docker logs mysql_cnt

[...]
2021-06-28T13:46:43.873232Z 0 [System] [MY-010931] [Server] /usr/sbin/mysqld: ready for connections. Version: '8.0.25'  socket: '/var/run/mysqld/mysqld.sock'  port: 3306  MySQL Community Server - GPL.

Start and stop the container

Stop your container:

docker stop mysql_cnt
mysql_cnt

Verify it’s stopped:

docker ps -a         
CONTAINER ID   IMAGE          COMMAND                  CREATED         STATUS                    PORTS     NAMES
30f6e1462b9e   5c62e459e087   "docker-entrypoint.s…"   5 minutes ago   Exited (0) 1 second ago             mysql_cnt

And restart it:

docker start mysql_cnt
mysql_cnt

Remove the container

As easy as stopping it and running:

docker rm mysql_cnt
mysql_cnt

Get a mysql command line client session

In order to authenticate, you need to have the mysql command line client installed, or even better, MySQL Shell:

docker exec -it mysql_cnt mysql -uroot -p        
Enter password: 
Welcome to the MySQL monitor.  Commands end with ; or \g.
Your MySQL connection id is 8
Server version: 8.0.25 MySQL Community Server - GPL

Copyright (c) 2000, 2021, Oracle and/or its affiliates.

Oracle is a registered trademark of Oracle Corporation and/or its
affiliates. Other names may be trademarks of their respective
owners.

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

mysql>

Create a bash session

In case you would like to install things or edit the my.cnf:

docker exec -it mysql_cnt bash           
root@10b5e2727ef3:/# 

Note that if you installed a Debian based release, you will be able to install stuff like:

apt-get update
apt-get install vim

If you installed the Oracle MySQL image, it comes with Oracle Linux installed. Then use:

microdnf update
microdnf install vim

You are now able to setup Docker in your laptop, download your favorite MySQL image, start it in a container and stop it and also capable of installing packages in the Linux distribution. You can configure and optimize MySQL as usual, using SET PERSIST (recommended over editing the configuration file manually, when possible).

If you are curious and would like to explore running MySQL containerized services, you may want to read the official documentation. You will find several hints to use networking or taking backups.

The post MySQL in a Docker Container cheat sheet appeared first on mortensi.

Planet MySQL