• Visual Studio 2017 中的Git源代码控制中使用BeyondCompare 3


    VS中如果source control选择git, 则并没有在vs中集成类似TFS的更改UI。需要到git的config文件中去手动更改。

    1. git全局config。

    路径在C:Users本地账号.gitconfig, 打开后更改为:

    [diff]

    tool = beyondcompare

    [difftool]

    prompt = true

    [difftool "beyondcompare"]

    cmd = "C:\Program Files (x86)\Beyond Compare 3\BComp.exe" "$LOCAL" "$REMOTE"

    keepBackup = false

    [merge]

    tool = beyondcompare

    [mergetool]

    prompt = true

    [mergetool "beyondcompare"]

    cmd = "C:\Program Files (x86)\Beyond Compare 3\BComp.exe" "$REMOTE" "$LOCAL" "$BASE" "$MERGED"

    keepBackup = false

    trustExitCode = true

    VS中的git设置的UI显示效果为:

    Visual Studio 2017 中的Git源代码控制中使用BeyondCompare 3

    2. git库下的config文件更改,

    路径在库文件夹下的.gitconfig, 打开后同样更改为:

    [diff]

    tool = beyondcompare

    [difftool]

    prompt = true

    [difftool "beyondcompare"]

    cmd = "C:\Program Files (x86)\Beyond Compare 3\BComp.exe" "$LOCAL" "$REMOTE"

    keepBackup = false

    [merge]

    tool = beyondcompare

    [mergetool]

    prompt = true

    [mergetool "beyondcompare"]

    cmd = "C:\Program Files (x86)\Beyond Compare 3\BComp.exe" "$REMOTE" "$LOCAL" "$BASE" "$MERGED"

    keepBackup = false

    trustExitCode = true

    VS中的存储库的设置的UI效果为:

    Visual Studio 2017 中的Git源代码控制中使用BeyondCompare 3

    文章参考(多谢作者分享):https://www.codercto.com/a/47065.html

  • 相关阅读:
    python 循环的概念
    python 字典的基本操作
    短路表达式
    快捷键myeclipse
    nginx静态文件访问
    安装mysql
    安装mongodb
    安装tomcat
    安装jdk8
    安装node和pm2
  • 原文地址:https://www.cnblogs.com/petunsecn/p/10602622.html
Copyright © 2020-2023  润新知