LabVIEW integration with TortoiseMerge

[lmd2]

Been using TortoiseSVN with LabVIEW for a couple of years. Resolving conflicts is sometimes painful. Saw this merge/conflict resolve tool "This is where TortoiseMerge helps. It is a diff / merge software tool for windows with a tight integration for TortoiseSVN."

The site specifically states for text code, but also that it is built on the TortoiseSVN libraries. Just wondering if anyone is using this with LabVIEW.

Thanks

[Sam_Sharp]

TortoiseMerge is literally a text-based based diff tool - so you can't use it with LabVIEW.

You *can* however set up TortoiseSVN to use the LVMerge / LVCompare tool. There's a guide here: https://www.dmcinfo.com/latest-thinking/blog/id/136/using-lvmerge-labview-merge-tool-with-tortoisesv...

In practice, it's not a great tool so I rarely use it - when working in a team we communicate to try and avoid merges wherever possible (e.g. working on separate VIs / modules).

[lmd2]

Well thanks for the info, saved me some doomed experimenting on my own. maybe we can hope for LVMerge to mature some more, thanks for the response.

[Bob_Schor]

Because of the graphical nature of LabVIEW code, I've always done "merges" myself, by "hand" and "eye".  I'm not sure I'd trust anything else.  What is useful is LVCompare, which can tell you if two VIs are different, and can, in principle, ignore "cosmetic" changes (like a moved wire).

Bob Schor