1、Git Confilict Resolver 快速查找git代码冲突
{ "keys": ["ctrl+alt+f"], "command": "find_next_conflict" },
{ "keys": ["ctrl+alt+o"], "command": "keep", "args": { "keep": "ours" } },
{ "keys": ["ctrl+alt+t"], "command": "keep", "args": { "keep": "theirs" } },
{ "keys": ["ctrl+alt+a"], "command": "keep", "args": { "keep": "ancestor" } },
{ "keys": ["ctrl+alt+c"], "command": "list_conflict_files" }
2、Local History
3、Compare Side-By-Side
本文介绍了一种使用GitConfilictResolver插件快速定位并解决git代码冲突的方法,包括使用快捷键进行冲突文件查找、保留本地修改、保留远程修改、保留祖先版本及列出所有冲突文件的功能。
4395

被折叠的 条评论
为什么被折叠?



