Visual Studio Code的Accept Current/Incoming/Both Change的合并冲突提示突然不见了,解决办法
设置里面搜索 git.mergeEditor 去掉图中Open the merge editors for files that are currently under confict
消失原因:
最近 VS Code 引入了Git merge editor,默认启用
参考文档:
git - Accept Incoming Change not appearing in VS Code - Stack Overflow