1

enter image description here

While I use Git Bash ,I encountered this phenomenon,but I can't return command terminal. How to solve this problem and what is the reason such phenomenon is occurred?

Community
  • 1
  • 1
Author
  • 425
  • 1
  • 4
  • 16
  • 5
    Press `Esc` and then enter `:x`. This is vim which is a text editor used to edit the merge commit message. – Minn Dec 05 '18 at 12:05
  • yes,you are right.I tried to pull from master branch and then this phenomenon is occurred,message is appeared : merge in not finished ,but I can't know what is the unmerged and how to solve this problem. I hope your help. – Author Dec 05 '18 at 12:11
  • This might help https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git – Minn Dec 05 '18 at 12:12
  • Thanks for your help! – Author Dec 05 '18 at 12:13
  • https://www.google.com/search?hl=en&pws=0&q=git+commit+terminal+blocked – phd Dec 05 '18 at 12:42

1 Answers1

3

press esc then :q! to exit vim without save.

and next time try to pull or merge with option --no-edit to commit without changing its commit message.

myx4play
  • 111
  • 3