1、安装beyond compare
Beyond compare 官网: https://www.beyondcompare.cc/wenti/xianshi-hongse.html
2、在git中配置
git config --global merge.tool bc3
git config --global mergetool.bc3.path "D:\Beyond Compare 4\BCompare.exe"
git config --global mergetool.keepBackup false
3、应用beyond compare解决冲突
git mergetool