Why are there no changes in the file during a conflicted merge?

Question

git

Installed git, and for some reason I don't understand, it refuses to show changes in a file that has a merge conflict. It is missing <<<<<<< HEADand takes the version of the file from the current branch, although I need changes from both branches. In git statuswrites that all conflicts are fixed.
How to fix it?

Answer 1

The conflict could occur not only because of the contents of the file, but also in the metadata.
For example, if a file is committed under Windows, then the file permissions are usually 777.
You can get a conflict under Linux, in which the permissions can vary greatly (typical usage is 755).
The same goes for case sensitivity. Some file systems have problems with encodings. For example, MacOS writes some letters differently than Linux does.
Some problems can be fixed in git, such as ignoring permissions or line endings.
Other problems will have to be solved outside the box, for example, moving to another file system.