LabVIEW

cancel
Showing results for 
Search instead for 
Did you mean: 

Labview Merge Problems

I have LVMerge setup to integrate changes with my version control package and it works fine, if slow ...  most of the time.

For some reason, with some VI's (especially larger ones), it refuses to "resolve" conflicts.

 

I click on Choose Theirs, windows flash around, the hourglass comes up, I get focus back, and nothing seems to have happened.  The conflict is still marked as unresolved.  Same for choose base or choose yours.  Even on conflicts that were auto-resolved, I can't go back and choose a different resolution.

 

I don't think it's a setup problem because this works fine on other VI's.  This doesn't seem to be a commonly used feature, there aren't a lot of forum posts on it, but I thought I'd throw it out there ...

 

Regards,
Mike

0 Kudos
Message 1 of 3
(2,438 Views)

This can be a version-dependent issue. What LabVIEW version and operating system are you running?

Ravi A.
National Instruments | Applications Engineer
0 Kudos
Message 2 of 3
(2,412 Views)

XPSP3 & LV2011 on both sides.

0 Kudos
Message 3 of 3
(2,388 Views)