Git and Labview Merging

[paljacob]

Had some issues getting the compare to work, but the final comment in the following link summerizes the solution I needed for it to work in Sourcetree

https://lavag.org/topic/17934-configuring-git-to-work-with-lvcompare-and-lvmerge/?do=findComment&com...

[RVallieu]

Pomodo

I am looking at using Bitbuckt with Git and Sourcetree (embedded GIT in Sourcetree) with LabVIEW for our branch at NASA since they have provided this to us through our tools chain as an approved secure remote hosting option.

I really like the Sourcetree interface for a GIT UI.  I came across this post trying to figure out how to get Sourcetree to run the LabVIEW compare and LabVIEW merge.

Your source files link appears to be dead.  Can you provide them again or clarify your instructions?  Where is the Paths variable located?

[RVallieu]

oops couldn't edit - I think perhaps you mean PATHS in the LabVIEW OPTIONS>Paths  ?