How to configure Visual Studio Code Merge tool with Rational Team Concert in Visual Studio?

Question

I'm using Rational Team Concert as source control tool, and I want to change the default merge tool. I really like the Visual Studio Code merge tool, but I don't know how to set it up to work with Team Concert.

Answer 1

In Visual Studio Go to TOOLS -> Options... -> Source Control -> Jazz Source Control -> Compare Tools

In this screen you can set up your Merge tool for Rational Team Concert.

First: check the option Use an external compare tool instead of the default compare utility.

Second: In the option External Compare Tool to Use: Select <<Custom>>

Third: In the option Location of Executable: Select the path where you installed VSCode, e.g C:\Program Files (x86)\Microsoft VS Code\Code.exe

Four: In the Option Local Compare Arguments: Add --diff "${file1Path}" "${file2Path}"

--diff is an argument that tells to VSCode that you want to use the Merge Tool

${file1Path} is the variable that holds the path of the first file.

${file2Path} is the variable that holds the path of the second file.

Finally: In the option Remote Compare Arguments: Add --diff "${file1Path}" "${file2Path}"

Note VSCode actually does not support 3-Way Conflict Compare you can find more info here https://github.com/Microsoft/vscode/issues/5770

More related: info http://blog.code-cop.org/2012/12/kdiff3-merge-tool-for-rtc.html, https://code.visualstudio.com/docs/editor/versioncontrol