Configuring Git Client to Compare TestStand Sequence Files

[BapiM]

While integrating Git with the Sequence Editor is under consideration, there is a KB document that specifies how you can configure TestStand File Diff and Merge Utility to compare and merge changes in your sequence files when they are saved in the binary format when using any of the following Git clients

• Microsoft Visual Studio
• Atlassian Sourcetree
• Git Cola
• GitKraken
• Tortoise Git

Link to the KB document: https://knowledge.ni.com/KnowledgeArticleDetails?id=kA0VU0000005Nbt0AE&l=en-US 

[jeffh23456]

has anyone used this with Sourcetree?

Does it work teststand only?

I have projects using c#, Labview in a teststand sequence

Does it play well with others, or do i need specific .gitignores and .gitconfigs for each type of project?

Thanks,

Jeff

[TomOrr0W]

I remember this KB article being rather confusing and ending up just using Sam Taggart's scripts as a base instead (they are still named LV compare, but they now support LabVIEW and TestStand compare/diff and merge).

New and Improved LV Compare Script

SAS-blog / LVCompare-Merge-Setup · GitLab

Once you run the script (which adds the compare/diff/merge tools to the global config), you can access them in SourceTree (there may be better ways to get to these; I am not a SourceTree Expert).

External Diff:

External Merge (right-click menu for merge conflict):