Find centralized, trusted content and collaborate around the technologies you use most.
Teams
Q&A for work
Connect and share knowledge within a single location that is structured and easy to search.
当我遇到合并冲突时,我会:
:Gvdiffsplit!
这会打开一个三向差异,让我可以为每个块在“我们的”和“他们的”之间进行选择。
一旦我完成了我需要做的任何事情,我如何关闭这个视图并返回到只查看文件?