一直使用的是beyond compare这个软件来作为比对和合并工具,不可否认,在用git的时候,配置这款工具比对确实很省事。现在我在用sublime写代码,在写的过程中可能涉及到和以前的代码版本做比对,这个时候还要打开这个软件那可不是我想要干的,插件众多的sublime我想这个比对插件肯定是有的吧,于是就找到了sublimemerge pro这款插件。
直接 ctrl + alt + p 输入install package…,搜索sublimemerge,安装即可。如果对安装方法不清楚可以查看sublime安装插件的教程。
安装之后会有一个readme,里面介绍了用法,如下
In file view: [ctrl]+[alt]+[d] - display Quick Panel with Sublimerge commands available for current view In diff view: [/] - display Differences Navigator [down] - select the next difference (only single selection is possible) [up] - select the previous difference (only single selection is possible) [left] - merge selected change(s) from right to left [right] - merge selected change(s) from left to right [shift]+[left] - merge all changes from right to left [shift]+[right] - merge all changes from left to right [ctrl]+[enter] - toggle edit mode (currently in 2-way diff view only) [ctrl]+[alt]+[left click] - select/deselect change block (multiple selection is possible) [ctrl]+[shift]+[left click] - merge selected changes from left to right [ctrl]+[shift]+[right click] - merge selected changes from right to left In directories diff view: [enter] - enter subdirectory (if differs) or diff selected text file [down] - select next file/directory [up] - select previous file/directory or navigate one level up [ctrl]+[alt]+[left click] - select/deselect change block (multiple selection is possible) [right] - apply selected change from left to right [left] - apply all changes from left to right [shift]+[left] - apply selected change from right to left [shift]+[right] - apply all changes from right to left
我还是刚安装,需要的也仅仅是比对而已,文件里面ctrl+alt+d,选择需要比对的文件,就ok啦,使用还是挺方便。
赞赏微信赞赏
支付宝赞赏