Source Code Control issue using LVMerge with Git and Sourcetree

[EnthusiasticTester]

I'm having problems using LVMerge.exe from Sourcetree.

In Sourcetree I have configured the External Merge tool to use LVMerge.exe (Tools>Options >> Diff -> External Diff /Merge) with the following arguments:

\"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\"

When I attempt to resolve a conflict by using the external merge tool I'm shown the NI_promergevis.lvlib:LVMerge Core.vi with an error code 7: NI_FileType.lvlib:Get File Type.vi.

When I close this window I am left with an extra file with .orig appended and the local file is assumed to have been correctly merged (despite nothing happening).

I have tried running LVMerge.exe from the command line. If I make copies of the files such that I have an existing $BASE, $REMOTE, $LOCAL, and $MERGED file then the command works as intended. I get to select and merge changes.

If any of the files do not exist then I get the same error as when I run it from Sourcetree.

When I run the command from Sourcetree it automatically generates copies of the file being merged with _BACKUP, _BASE, _LOCAL, and _REMOTE appended. I suspect that it either does not do so quickly enough or perhaps does not generate correctly formatted files which is why I get the error. Since the files are deleted afterwards I cannot simply run the merge twice.

Does anyone have experience using LVMerge with Sourcetree?

[jaswanth_venkat]

Here’s a more concise version of the response:

---

Response:
I’m facing the same issue with LVMerge.exe in Sourcetree. I'm using LabVIEW Q3. I’ve configured the external merge tool with the arguments: \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\". (refered to Configuring SourceTree and git to use LabVIEW Compare and LabVIEW Merge custom tools - Source Code C... & https://github.com/smithed/vicompare for reference).

Issue Details:

• When resolving conflicts, I get an error: NI_promergevis.lvlib:LVMerge Core.vi with code 7 (NI_FileType.lvlib:Get File Type.vi).
• Closing the error leaves a .orig file. 
  

Testing Observations:

• Running LVMerge.exe works if all input files ($BASE, $REMOTE, $LOCAL, $MERGED) are created and passed manually.
• Sourcetree generates temporary files in my case as well, shown in the below diagram. 

Does anyone know how to ensure Sourcetree generates compatible files or resolve this issue?