I am simply trying to do a git pull which I have done hundreds of times. For some reason, this time it is showing me this in the console
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
however, nothing opens for me to enter this commit message. I believe something like Vim or whatever should open (which I have never used) but I am at a stalemate trying to pull code.
I see this in my git config
core.editor=vi
What can I do? Can I enter said commit message some other way? I am using Mac OSX Lion.
vidid start.