Test Stand sequence merge in Git

[Aurelian.Ciobanu]

Hello,

We are using Test Stand for creating testing sequencies, and GIT for versioning.

We would like to introduce some collaborative work in our team and we want to find a way to merge the *.seq files into the branch. We also want to know if we can compare the modifications between previous versions of the sequence.

Do you know if there is a plugin, or something, to help us?

We are using now GitDesktop as application for GIT. We are also open to use other tools if necessary.

Thank you in advance.

Regards,

Aurelian

[Oli_Wachno]

Yes, there is a tool which gets installed along TestStand.

Try googling  „TestStand Diff Merge Utility“

[Aurelian.Ciobanu]

Thank you Oil_Wachno for your answer.

I know about that software and it is useful, but my question was if there is a plugin related to Git (GitDesktop app) in order to merge the files during a commit or to compare with previous version.

[Oli_Wachno]

Sorry for not reading your message properly.

so I guess using the DiffMergeTool from the CLI wouldn’t be a solution….

[stephenb2]

I've done it manually. Check out the old version and name it sequence_old.seq and run the NI diff tool on it. I make notes in a text editor and then use those notes in the commit message. Sorry, not exactly seamless...

[Aurelian.Ciobanu]

Thank you all for your answers.

This part with the notes is a good point. I will take it into consideration. 

I will keep this open, maybe there are also other ideas, or there is a clear solution for this topic.