Tutorial on git using git bash fixing the conflict

I’ve following a tutorial on git using git bash and came to the point where after typing the git command git commit below show up. I’m in windows operating system and I can no longer proceed.

Merge branch 'second-branch'

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


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#       modified:   index.txt
~
~
~
~

anyone can suggest what to do next?

  • How to identify conflicting commits by hash during git rebase?
  • Git: How are we losing code?
  • Can I make fast forwarding be off by default in git?
  • How can I ignore the entire bower_components directory when merging with git?
  • Make All Merges Manual in Git
  • Merging with git - how do I figure out where the 'new' code ends?
  • git merge recursive theirs, how does it work?
  • subversion merge a delete command
  • One Solution collect form web for “Tutorial on git using git bash fixing the conflict”

    close the editor?

    since this editor is vi, which has a modal user interface, it might be a bit unusual if you are used to typical w32 programs…

    Here’s how you save the file and close it:

    1. press Esc to go into command-mode
    2. type (this will appear in the footer-line of the screen) :wq (colon and then type wq) and hit Return (this will write the file and quit the editor)
    Git Baby is a git and github fan, let's start git clone.