NI TestStand

cancel
Showing results for 
Search instead for 
Did you mean: 

Test Stand sequence merge in Git

Solved!
Go to solution

I have zipped the .gitignore and .gitattributes files that we use for TestStand /eriStand / LabVIEW / Python ... I hope this helps.

 

The other piece is that you have to go into TestStand and change ALL file types from binary to XML otherwise git tries to merge binary and it gets ugly quickly. There will be occasional merge conflicts for some XML files but it is very easy to fix them and then re-commit.

 

Reach out if you have any other questions.

 

Randy

Message 11 of 11
(146 Views)