D
D
Dmytro2017-05-04 19:04:42
git
Dmytro, 2017-05-04 19:04:42

Why, after resolving the conflict and merging in git, the commit does not look as expected?

After merging with conflicts and resolving them, I write git commit, after which I expect the commit file to open in the editor with something like this:

Merge branch 'iss53'

Conflicts:
  index.html
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
#

But for some reason, for a long time after the git commit command, I see that the lines with conflicting files are commented out:
https://scrn.alximicus.com/s8ELU5y6ewmvz--0UW_PXTb...
In general, for some reason, the git began to comment on these lines.
Who can tell why?

Answer the question

In order to leave comments, you need to log in

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question