GIT merge with conflicts generated message appears

user_17653120 0
Viewed 557

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. enter image description here 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.enter image description here Please tell me what I need to do while in the terminal or how to set up the editor for such messages.

vscode-git visual-studio-code git
2 Answers

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.

VonC_63090

Open VS Code for any type of Git message (e.g. git merge/git commit etc.) -

git config --global core.editor 'code --wait'

Open VS Code for diff tool -

git config --global diff.tool vscode

Open VS Code for merge tool -

git config --global merge.tool vscode

For more check this life-saving article - https://www.roboleary.net/vscode/2020/09/15/vscode-git.html

user_36937630
Related