Maybe this will help you.
When git pulling master into a feature branch, you may get this error:
Merge branch 'master' of xxxxxxxx into xxxxxxxxx
Ah, stuck in VIM.
Here's what I did. It seemed to work.
cntrl x + cntrl v + commit message + :wq
If that doesn't help, try this thread from stackoverflow https://stackoverflow.com/questions/19085807/please-enter-a-commit-message-to-explain-why-this-merge-is-necessary-especially