Merge Conflicts, I have Beyond Compare 3 installed but Source Control tool is not recognizing it

SchulzDL

When handling merge conflicts, the documentation says that if Beyond Compare 3 or Kdiff are installed they would work with the Source Control tool.  However this is not happening and instead the Source Control is saying "You need to resolve the conflicts with another Git tool (ie outside SQL Source Control) before you can continue."  What needs to happen for the Redgate Source Control tool to recognize Beyond Compare and work with me to resolve my conflicts.

Russell D

SQL Source Control. Source Control looks in the registry for Software\Scooter Software\Beyond Compare 3in either HKLM or HKCU, for a value of a key called ExePath. If found, it checks that the file path defined in that key exists, and if so uses that as the location for the merge tool. Do you have this key present?

SchulzDL

I did have this entry for the HKCU but not for the HKLM.  I added it to the HKLM but it still does not seem to make a difference even after I rebooted, Beyond Compare 3 will not jump in to help handle the conflict like the documentation describes.

Russell D

Can you recreate this with logging set to ALL (see https://documentation.red-gate.com/soc6/troubleshooting/logging-and-log-files) and send us a log file?

SchulzDL

I turned the logging on went through the process of pushing up a conflicting change where Beyond does not popup.  I have attempted to attach the logs but it keeps telling me there it failed to upload.

Russell D

Can you email them in to support@red-gate.com?

SchulzDL

I have sent an email with the logs attached.  Thank you.

Russell D

Ah this makes sense @SchulzDL . Beyond Compare3/Kdiff are only used for SProc conflicts. SQL Source Control cannot handle merging/resolving Git conflicts - or, in fact, any other kind of VCS merge conflict. If you have Git conflicts, you need to use a separate Git tool to resolve them.

I appreciate it's not entirely clear but the documentation does state that: https://documentation.red-gate.com/soc6/common-tasks/resolve-and-merge-conflicts#Resolveandmergeconflicts-Mergeconflictedstoredprocedures(usingBeyondCompare3orKDiff3).

kirbykirby

Bumping an old thread - I have kdiff3 installed and it's not recognizing it.

Russell D said:

SQL Source Control. Source Control looks in the registry for Software\Scooter Software\Beyond Compare 3in either HKLM or HKCU, for a value of a key called ExePath. If found, it checks that the file path defined in that key exists, and if so uses that as the location for the merge tool. Do you have this key present?

Does anyone know where the registry key is supposed to be located for kdiff? (Not "Beyond Compare".)