I’ve got 2 branches I would like to merge: main and sub. In both branches there is a file called Math.java. This class contains one function on both branches: addition() on main and subtraktion() on sub. When I type in git diff into the console it shows all the differences:

diff command in console

But when I run the git merge command, it only shows one difference in the Math.java file, like this:

<<<<<<< HEAD
        System.out.println("Summand 1: ");
=======
        
        System.out.println("Minuend: ");
>>>>>>>

Why is merge only detecting one different line of code and not the others like with the diff command? I would like to have all differences in the Math.java after the merge command.

How do I get that?

I deleted the files and copied them again into the directories, but that didn’t change anything.