vscode still opens when I am making a merge commit?

已回答

I noticed that anytime I am resolving merge conflicts or simply merging, vscode will automatically open. I cannot continue until I exit the commit message that vscode shows me. I would like to just have all this done in rubymine since I no longer use vscode to develop. anyone know how to solve this? I work around it by running git commit -m "message" so that the commit message window doesn't open but I can't avoid this with merge commit messages. Also if I manually click git --> merge in rubymine I can make a merge without vscode opening but I prefer to use the terminal. thanks!

评论操作 固定链接

Is there a chance that you may have git-mergetool specified in config? 

https://git-scm.com/docs/git-mergetool

0
评论操作 固定链接

Ruslan Kuleshov haven't used git mergetool before 

0
评论操作 固定链接

Kylene

Could you please share screencast of an issue or screenshots of how exactly it's happening?
Do you have some git hook configured?

0

请先登录再写评论。