How do I change the git merge tool that SSC opens?

jstamm

I've set up my database git repo to use Visual Studio Code for merging and diffing. From my git config:

[merge]
	tool = vscode
[mergetool "vscode"]
	cmd = "code --wait "
[diff]
	tool = vscode
[difftool "vscode"]
	cmd = "code --wait --diff  "

But when I click the Merge button in SSC to open the merge tool...



...it just launches KDiff, which is what I initially set up. Why is SSC not honoring my git config settings, and how can I change the tool that is used?

Russell D

Just for reference SoC only really supports BC3/Kdiff for this functionality (https://documentation.red-gate.com/soc7/common-tasks/resolve-and-merge-conflicts#Resolveandmergeconflicts-Mergeconflictedstoredprocedures(usingBeyondCompare3orKDiff3).

You can request VSCode support here: https://redgate.uservoice.com/forums/39019-sql-source-control. 

As to why its ignoring your git config, I'm pretty sure it doesn't read your git config at this stage but I'll double check that.

Russell D

No, its not possible I'm afraid, I'd request it at the above link.