I put git and, for some reason I do not understand, he refuses to show changes in the file in which the merge conflict occurred. There is no <<<<<<< HEAD and it takes the version of the file from the current branch.

How to fix this?

  • What is git status ? - D-side
  • All conflicts fixed but you are still merging. (use "git commit" to conclude merge) - HookeD
  • Well, translate :) - D-side
  • writes that no conflicts were found - HookeD
  • Conflicts corrected. Now that in brackets. - D-side

2 answers 2

in order to interrupt an incomplete merge , you can use, for example:

 $ git merge --abort

    Unlike svn, git reports a conflict when any file is edited in both merged branches. In this case, it may be that both edits were the same, and there really is no conflict. But git thinks that the user needs to be notified, because user smarter.