Visual Studio Code

VScode的三方比對

使用這個插件來達成

https://stackoverflow.com/questions/49062666/what-visual-studio-code-extension-is-good-for-3-way-merging https://stackoverflow.com/questions/2114111/where-is-the-global-git-config-data-stored

全局的gitconfig在哪裡

git config --list --show-origin

gitconfig配置內容

windows版本

[diff]
    tool = beyondcompare4
[difftool "beyondcompare4"]
    cmd = \"C:\\Program Files\\Beyond Compare 4\\bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
    tool = beyondcompare4
[mergetool]
    keepbackup = false
[mergetool "beyondcompare4"]
    cmd = \"C:\\Program Files\\Beyond Compare 4\\bcomp.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
    trustexitcode = true

Home