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 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:
Luckily, we can tell
git to use ...