问题描述:
git pull时未冲突,但是merge失败,pull下来的文件需要重新commit
报错内容:
error: There was a problem with the editor 'vi'.
Not committing merge; use 'git commit' to complete the merge.
解决方案:
git config --global core.editor '/usr/bin/vim -f -u NONE'
问题描述:
git pull时未冲突,但是merge失败,pull下来的文件需要重新commit
报错内容:
error: There was a problem with the editor 'vi'.
Not committing merge; use 'git commit' to complete the merge.
解决方案:
git config --global core.editor '/usr/bin/vim -f -u NONE'
转载于:https://my.oschina.net/yanyahu/blog/898009