How do I configure Araxis Merge for use with Visual Studio Git?

Deadly 提交于 2019-12-24 09:15:11

问题


I have to use Git with Visual Studio 2017 now, and there doesn't seem to be a way to link Araxis Merge with Visual Studio / Git.

This explains how to link Visual Studio TFS with Araxis.

This explains how to link Git with Araxis.

But how to link Visual Studio 2017 Plug-in Selection (with Git) to Araxis?


回答1:


In the current source control plug-in drop-down, select Visual Studio Team Foundation.

You can follow the link that you mentioned in the question to setup araxis.

If you still can't, it's because your source is being controlled by Git instread for Team Foundation. You need to update git config use araxis as diff and merge too. You can find your git config file in ur repo under '.git/config'.

Sample below.

[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


来源:https://stackoverflow.com/questions/51952582/how-do-i-configure-araxis-merge-for-use-with-visual-studio-git

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!