Git diff shows difference between branches, but merge doesn't show all differences

Question

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.

stackoverflow.com/questions/14961255/what-is-git-merge-doing — phd
– phd, Commented Apr 24, 2024 at 13:07
Those are merge conflict markers. It seems that you do not know what merge is or what a merge conflict is. If there had not been that one conflict, the merge would not have inserted any conflict markers; it would have just done the merge, kaboom. Perhaps you would be helped by reading my biteinteractive.com/understanding-git-merge — matt
– matt, Commented Apr 24, 2024 at 13:20

lance-java · Accepted Answer · 2024-04-24 12:27:39Z

1

Is it possible that git merge automatically merged the non-conflicting changes? So this single line is just what could not be automatically merged?

answered Apr 24, 2024 at 12:27

lance-java

29.4k6 gold badges73 silver badges114 bronze badges

Sign up to request clarification or add additional context in comments.

3 Comments

jwberlin Over a year ago

That would mean, that merge overwrites all different lines of code, except one. That would be really weird behaviour.

eftshift0 Over a year ago

It does not overwrite... it just mixes the changes coming from each brach.... the other sections were mixed without issues.... the same way a person who does not code would do if they saw the java files as text.

lance-java Over a year ago

Are you merging a single commit? Or multiple commits?

Collectives™ on Stack Overflow

Git diff shows difference between branches, but merge doesn't show all differences

1 Answer 1

3 Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

3 Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related