Setting up Beyond Compare in Visual Studio 2013 when using Git

后端 未结 2 1314
失恋的感觉
失恋的感觉 2021-01-30 13:32

How to configure Visual Studio to use Beyond Compare has a great answer for how to configure Visual Studio to use Beyond Compare. However, the UI for these steps has changed in

2条回答
  •  遥遥无期
    2021-01-30 14:13

    I see your BeyondCompare integration and raise you automerge capabilities. Trust me if you are merging large amounts of files you will want the automerge option enabled :)

    [diff]
            tool = bc3
    [difftool]
            prompt = false
    [difftool "bc3"]
            path = /c/Program Files (x86)/Beyond Compare 3/BComp.exe
    [merge]
            tool = bc3
    [mergetool]
            prompt = false
            keepBackup = false
    [mergetool "bc3"]
            cmd = /c/Program Files (x86)/Beyond Compare 3/BComp.exe -automerge -ignoreunimportant -reviewconflicts "$LOCAL" "$REMOTE" "$BASE" "$MERGED" 
            trustExitCode = true
    

提交回复
热议问题