- 安装beyond compare
- 在git中配置
git config --local merge.tool bc3
git config --local mergetool.path '/user/local/bin/bcomp'
git config --local mergetool.keepBackup false
-- local:仅对本项目生效
mergetool.path '/user/local/bin/bcomp' :beyond compare 安装路径
mergetool.keepBackup false : 解决冲突后,不备份原始文件
- 应用beyond compare解决冲突
- git mergetool
- 自动打开beyond compare软件,界面化解决冲突