我现在必须使用Visual Studio 2017配合Git,但似乎没有办法将Araxis Merge与Visual Studio/Git关联。这里说明了如何将Visual Studio TFS与Araxis关联。这里说明了如何将Git与Araxis关联。但是如何将
Visual Studio 2017插件选择
(带Git)关联到Araxis?
Visual Studio 2017插件选择
(带Git)关联到Araxis?
[user]
name = <your name>
email = <your email address>
[diff]
tool = araxisdiff
[difftool "araxisdiff"]
cmd = \"C:\\Program Files\\Araxis\\Araxis Merge\\Merge.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = araxismerge
[mergetool "araxismerge"]
cmd = \"C:\\Program Files\\Araxis\\Araxis Merge\\Merge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
keepBackup = false
[diff]
tool = araxis
[merge]
tool = araxis
[mergetool "araxis"]
path = C:/Program Files/Araxis/Araxis Merge/Compare.exe
[difftool "araxis"]
path = C:/Program Files/Araxis/Araxis Merge/Compare.exe
这是我在两个配置文件中都需要使用的内容:
[diff]
tool = araxis
[difftool "araxis"]
path = C:\\Users\\{my UserName}\\AppData\\Local\\Apps\\Araxis\\Araxis Merge\\compare.exe
[merge]
tool = araxis
[mergetool "araxis"]
path = C:\\Users\\{my UserName}\\AppData\\Local\\Apps\\Araxis\\Araxis Merge\\compare.exe
如果它能工作,那么你会看到一个灰色的araxis
,并且使用 Visual Studio
是可选择的,乍一看这似乎是违反直觉的(在我看来)。
这是您在配置中看到的内容: