1、先安裝SourceTree工具、 beyong compare工具
2、在 SourceTree工具加載beyong compare插件
1、工具、選項、比較
2、就是修改.gitconfig文件，添加下面代碼，注意路徑是否相同
[diff]
tool = sourcetree
[difftool]
prompt = false
[difftool "sourcetree"]
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[merge]
tool = sourcetree
[mergetool]
prompt = false
[mergetool "sourcetree"]
trustExitCode = true
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
[difftool]
prompt = false
[difftool "sourcetree"]
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[merge]
tool = sourcetree
[mergetool]
prompt = false
[mergetool "sourcetree"]
trustExitCode = true
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
3、先提交本地項目
4、拉取數據
5、進行本地和拉取數據進行對比
6、提交
7、推送