Merging Git conflicts with ease

Now let's look at another improvement that we can bring to git. Most tasks are easy to execute from the command line, but some tasks, such as merging, require a specialist's eye for understanding the different format.

Let's open the feature file from our previous chapter, edit it, add a new line, and save it:

git diff
Merging Git conflicts with ease

The git diff command will show us colored text explaining the differences between the git file and the modified file, but some people find this format hard to understand:

Merging Git conflicts with ease

Luckily, we can tell git to use ...

Get Working with Linux – Quick Hacks for the Command Line now with the O’Reilly learning platform.

O’Reilly members experience live online training, plus books, videos, and digital content from nearly 200 publishers.