- 安装beyond-compare
- 在git 中配置
git config --local merge.tool bc3
git config --local mergetool.path ‘/usr/local/bin/bcomp’
git config --local mergetool.keepBackup false
- 出现冲突之后运行
git mergetool
git config --local merge.tool bc3
git config --local mergetool.path ‘/usr/local/bin/bcomp’
git config --local mergetool.keepBackup false
git mergetool