ni.com is currently undergoing scheduled maintenance.

Some services may be unavailable at this time. Please contact us for help or try again later.

LabVIEW

cancel
Showing results for 
Search instead for 
Did you mean: 

Configuring Git Extension for Merge and Compare

Solved!
Go to solution

Hi, 

 

I am looking to configure the Merge and Diff tool in Git Extension. 

Due to our IT policy we cannot use any other client than Git Extension. 

I know there are already a lot of post concerning this topic since 2013. And I was going from a link to another and unfortunatly was not able to find a solution. 

Please if you succeed to configure GitExtension could you share your solution. 

 

Thanks in advance

0 Kudos
Message 1 of 3
(6,078 Views)
Solution
Accepted by topic author Redzouz1

I finally found a solution.
I am using a script done by Samuel Taggart, it can be downloaded here SAS-blog / LVCompare-Merge-Setup · GitLab

 

The setup instruction are on the link. which consist of running the following batch command:

cd && git clone https://gitlab.com/sas-blog/LVCompare-Merge-Setup.git && cd LVCompare-Merge-Setup && ./setupLVTools.sh

 

then I have configured git extension as follow>

Redzouz1_0-1685540164878.png

 

cheers,

 

0 Kudos
Message 2 of 3
(6,007 Views)

hi  Redzouz1,

 

Do you have found a solution also for TestStand Diff/Merge Tool?

 

Best Regards,

Zuc

0 Kudos
Message 3 of 3
(930 Views)