LabVIEW Merge: Auto-resolve
Do you know that you can automatically merge two VIs developed between two different members as long as there is very no conflict in the same structure? For example, if you have modified one of the states and the other developer modified totally different state, then when you merge with Auto-resolve checkbox enabled, LabVIEW will try to merge both of your changes into a single VI. Auto-Resolve checkbox in Merge Options Options Here in this merge, you can find LabVIEW has resolved between mine (Yours) and other developer work (Theirs).