How to make use of diff3 on Linux to match three information and resolve conflicts

The Linux diff3 command detects variations between three textual content information. This helps you establish variations, perceive their variations, and merge the adjustments. diff3’s nice for supply code, scripts, or any plain textual content file.

What is a diff?

Spot the distinction, however for information

A diff is the results of operating a differencing tool on a set of files. The ensuing output incorporates an inventory of the variations inside every of the information. The variations are recognized by line quantity, and which file the distinction is in. As you’d in all probability count on, diff3 creates diffs from three information.

Software model management (SVC) packages equivalent to Git do diffs as part and parcel of what they’re, they usually do it exceptionally nicely. If you’re utilizing Git or one other SVC for diffing information, it is best to carry on doing so.

It’s not simply builders who can make use of diffs. If you’ve obtained any text-based materials with completely different drafts saved in numerous information, you’re prone to discover diffs useful.

The diff3 command makes the troublesome drawback of diffing three information manageable.

How diff3 is completely different

Triple the diff

diff3 takes three filenames as parameters. By conference, they’re known as mine, older, and yours, however they are often named something. The mine, older, and yours mannequin assumes an older ancestor file and two modified derivatives.

Here’s a easy instance.

This is my-file.txt.

first line
second line
edited third line

This is old-file.txt.

first line
second line
third line

This is your-file.txt.

first line
second line
modified third line

We can carry out a three-way diff by itemizing the information so as on the command line.

diff3 my-file.txt old-file.txt your-file.txt

diff3 reviews that every file has a distinct third line.

The diff3 output format

What’s a hunk?

Differences are displayed in hunks. A hunk begins with ‘====’ and an elective quantity, indicating which file the variations are from. The quantity is the place of the file on the command line. No quantity means all three information differ.

Here’s an instance. Files older.txt and yours.txt include these traces.

Line 1
Line 2
Line 3

File mine.txt incorporates a modified first line.

My file Line 1
Line 2
Line 3

Here’s the diff3 command.

diff3 mine.txt older.txt yours.txt

The ‘====1’ delimiter means file 1, or mine.txt.

The ‘1:’ means file one. The ‘1c’ means line one requires altering whether it is to match the identical line within the older file. The line is displayed.

The corresponding traces from information two and three are proven. Because they include the identical textual content as each other, it’s listed as soon as, however recognized twice. The stacked ‘2:1c’ and ‘3:1c’ point out the road seems in each information, with the road proven beneath them.

Let’s make mine.txt and yours.txt the identical, with this textual content.

Line 1
Line 2
Line 3

The older.txt file has a modified second line.

Line 1
Older file Line 2
Line 3

We have not modified the filenames, so we will run the identical command as soon as extra.

diff3 mine.txt older.txt yours.txt

The ‘2’ on the finish of the delimiter ‘====2’ exhibits the distinction on this hunk is in file two. The corresponding line from file one and three is displayed, and the road with the variations from file two is displayed.

Let’s modify file two as soon as extra, and add a line that isn’t within the different information.

Line 1
Older file Line 2
Line 3
Line 4

We can use our identical command.

diff3 mine.txt older.txt yours.txt

This time, we now have two hunks. Both delimiters seek advice from variations in file two.

The first hunk means line two in information one and three must be modified to match the identical line in file two. Or, line two in file two must be modified to match the opposite two information.

The second hunk introduces a brand new piece of knowledge. The older.txt file has a fourth line. The ‘1:3a’ and ‘3:3a’ inform us that in information one and three, a brand new line must be appended after line three, to match file two. The line is proven beneath them.

The different factor diff3 can show is sequences of traces containing variations.

Let’s make mine.txt and older.txt the identical, with this content material.

Line 1
Line 2
Line 3

We’ll change two traces in yours.txt

Line 1
Yours Line 2
Yours Line 3

We’ll run the identical command.

diff3 mine.txt older.txt yours.txt

This time, the road indicators don’t use a single line quantity. They have two line numbers separated by a comma ‘,’ to signify a spread of traces. For instance, ‘1:2,3c’ tells us that in file 1, traces two to a few have variations.

Merging with diff3

Bring all of it collectively

Instead of getting diff3 to checklist the variations, we will ask diff3 to merge the contents and variations from the information into one single file. What it’s really doing is rolling the variations between file three and file two, into file primary.

If you’re fortunate, your information will merge with no conflicts. Sometimes there are adjustments in the identical place within the information, inflicting conflicts. Conflicts are highlighted so you’ll be able to select which units of traces you want to preserve.

The output is written to the terminal window, however you’ll be able to simply redirect this right into a file, then edit the file to assessment it.

Here’s a easy case. Here’s the contents of mine.txt.

We're going to
run diff3
towards these information.
Yipee!

This is what’s in older.txt.

We're going to
run diff3
towards these information.

The yours.txt file incorporates this.

We're going to
run the diff3 command
towards these information.

We’ll use our acquainted command to do a diff, then we’ll run it once more with the -m (merge) choice to carry out the merge.

diff3 mine.txt older.txt yours.txt
diff3 -m mine.txt older.txt yours.txt

This blends the variations between older.txt and yours.txt into mine.txt, creating a brand new fourth model. To seize this output, add a redirect to the command.

diff3 -m mine.txt older.txt yours.txt > fourth.txt

Sadly, it is uncommon your merges are that easy. Here’s a extra difficult instance. The identical traces are modified in a number of information.

Here’s our new mine.txt

chaffinch
swallow
pigeon
sparrow
nuthatch

This is our new older.txt

chaffinch
swallow
pigeon
dove
nuthatch

Finally, our new yours.txt.

chaffinch
cuckoo
rook
dove
nuthatch
woodpecker
goldfinch

This is the outcomes of a diff.

diff3 mine.txt older.txt yours.txt

There are adjustments in all three information, and further traces in a single file. We’ll do a merge and redirect the output to a brand new file.

diff3 -m mine.txt older.txt yours.txt > new-file.txt

Using your favourite editor, open the file.

gedit new-file.txt

The part between the 2 delimiters ‘>>>>>>’ is a clash.

The conflicting traces from every file are proven in flip. The traces from file one are between ‘>>>>>>.’

On a real-world file you’re prone to have a number of areas of clash to assessment and edit, to make them include the textual content from the part you wish to preserve.

Differences and Conflicts

It’s straightforward to overlook what adjustments you have made to completely different variations of a file. The diff3 command makes it straightforward to search out these variations. There’s extra human interplay wanted for merging than for diffing, however at the least diff3 makes it troublesome to overlook a clash.