高效使用vimdiff解决git merge冲突(英文版)

redguardtoo

于 2013-06-11 20:55:40 发布

阅读量2.5w

点赞数

分类专栏：程序设计原理和技巧 Linux en 文章标签： vim merge Git Branch

本文链接：https://blog.youkuaiyun.com/redguardtoo/article/details/9076961

版权

本文介绍了如何设置和使用vimdiff作为Git的默认合并工具来解决合并冲突。通过编辑~/.vimrc配置快捷键，并创建具有冲突的Git项目进行实践。在vimdiff中，可以使用快捷键从不同缓冲区选择内容解决冲突，使用":xa"退出并自动处理下一个冲突文件。文章还提供了vim插件fugitive.vim的相关信息以及快速启动vimdiff的命令。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

If you are already a vim and git master and you are impatient, please jump to theQuick start section at the end of this article.

1 Set up vimdiff

The vimdiff as a merge tool will display several buffers to show the yours/theirs/original changes.

The key point is to set up the vimdiff so that the buffer number in the vimdiff status line is visible.

First, add following code into your ~/.vimrc

set laststatus=2 "show the status line
set statusline=%-10.3n  "buffer number

Second, if you know the buffer number, you can use hot key like ",2" (press comma first, then press two as quickly as possible) to pull change from buffer number two.Add below code into your ~/.vimrc to set up hot keys:

map <silent> <leader>1 :diffget 1<CR> :diffupdate<CR>
map <silent> <leader>2 :diffget 2<CR

最低0.47元/天解锁文章