I am learning how to work with Git. On windows with VS Code. I am learning merge with conflicts. After resolving commit conflicts, I will see an auto-generated commit message containing a list of conflicting files. It opens automatically in the built-in GIT terminal. There is nothing more I can do. I press :q or :wq it does not work. Everywhere they write that you just need to save, I don't know how to do it. I saw on YouTube how one person opens a separate window in VS Code in which he can save this message and work further, but there is no way to set it up. Please tell me what I need to do while in the terminal or how to set up the editor for such messages.

CodePudding user response：

Check first your git config --global core.editor value.

I have set mine to "%LOCALAPPDATA%\Programs\Microsoft VS Code\bin\code" --wait

That should avoid vim, which is not well supported in the included Terminal console of VSCode.