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: