Let's look at another improvement we can bring to get. Most tasks are easy to execute from the command line. But some tasks like merging require a specialists eye for understanding the format. Let's open the feature file from our previous chapter and hit add a new line and save it. The good diff command will show us a color text explaining the differences between the good file and the modified file. But some people find this format hard to understand.

Luckily, we can tell get to use external tools when it comes to Marte. And one external tool that we can use is called melt. But first, let's install it using sudo apt install melt. After this, we can run the command get diff tool. This will ask us if we want to launch meld as an external program for viewing the fire. It's also giving us a list of tools it can use for displaying the diff.

Hit yes to open mouth. Now we can easily see the two files side by side and see the differences between them. We can see that two one has been changed to two, and a new line has been added. Based on this output, we can easily decide if you want to add it or not. let's commit the file as it is. Next, we will look at merge conflicts.

Let's manually create a branch called test and add it to the same file committed And then the switch back to the develop branch. Let's update the same file committed and then try to merge the test branch. And, of course there is a merge conflict. for resolving the conflict, we will use Git merge tool, which again offers to open meld and in meld we can see the three files left is the file from our current branch. Right is the file from the remote branch. middle is the resulting file that will be created.

Let's say that we decide the correct version for the future. For and that we also want to add some text, save the file and commit. Okay, you can see the predefined commit message, and don't forget to remove the temporary file that was created at the mart. In general, most moderators offer plugins for working with get, including merging and diffs. We recommend that you get more acquainted with the command line tools because then you don't need to learn a new gate plugin when switching from one either to another. The get command works the same way across Linux, Mac and Windows.

It is definitely a tool that developers use a lot and being fluent in it will certainly boost your productivity.