Answer the question
In order to leave comments, you need to log in
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.
#
Answer the question
In order to leave comments, you need to log in
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question