Quote:
Originally Posted by Tanner
For some reason, I don't have a LVCompare.
Had to change the binary line to this for it to execute:
Code:
git config --system merge.labview.recursive binary
And I could not get the merge.labview.driver line to run. Git didn't like it for some reason.
If I have this in my .gitconfig for the diff,
Code:
[diff "labview"]
command = "C:/Program Files/meta-diff suite/lvdiff.exe"
#command = 'C:/Users/Tanner/Desktop/FIRST 2010 Beta/lvcompare.sh'
"git diff" either does nothing or prints out a paragraph length of empty space to the terminal.
Still get the same thing for merging. The little error dialog does spend some time being open, but I can't find anything else open. When I did it, it didn't seem to merge anything, just use the last commit out of the two branches I merged.
-Tanner |
The merge.labview.recursive was my fault. What difference does it make being set vs. not set? Maybe LVMerge is getting executed, just badly.
Try prepending "echo" to the driver too, to see exactly what it is calling. It should be giving LVMerge a set of three temporary files to evaluate then write back. Maybe you want to try it by hand too, check the NI documents I linked to.
Google suggests that no one has ever tried using Git and LabView together before, or, everyone else has just gotten it right the first time.
In any event it doesn't appear to be a heavily used feature of LabVIEW.
Maybe it is also the case that you have to use \\ or / instead of a single \ (though it looks like you have tried that).