Ubuntu 下安装Beyond Compare 安装解决方案

最近一直在Ubuntu 下开发项目功能,今天遇到了git 合并的时候代码冲突的问题:

使用git mergetool 工具的时候才发现并没有安装相关的合并工具

想起来了使用BC ,Beyond Compare 工具 ,查找了安装教程:

1.bc下载:

 sudo wget http://www.scootersoftware.com/bcompare-4.1.9.21719_amd64.deb

2.直接使用dbkg 安装命令个进行安装

dk@dk-Inspiron-5576:~/Desktop$ sudo dpkg -i bcompare-4.1.9.21719_amd64.deb 

再使用git mergetool工具的时候提示:

dk@dk-Inspiron-5576:/var/www/html/tvupd$ sudo git mergetool 
[sudo] password for dk: 

This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare emerge vimdiff
Merging:
website/application/controllers/Ibrown/Ibrown.php

Normal merge conflict for 'website/application/controllers/Ibrown/Ibrown.php':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (bc): 

自动打开了BC对比工具

BC 代码对比工具有试用期,过期后需要购买,可以考虑使用Meld 工具,只需要在Ubuntu 16.04 LTS的AppStore中搜索Meld 关键字即可.

界面简洁.

原文地址:https://www.cnblogs.com/bing-yu12/p/7872879.html