Resolve Conflicts grayed out button problem

[Ken_Brooks]

Using LabVIEW 17, I did a massive reorganization of a project that had grown chaotically over several months. I started a brand-new project, hoping that that would get past the well-known conflict resolution problems. I gave it auto-populating folders. But no help! Every possible conflict has come back to haunt me.

But the worst of it is, the Resolve Conflicts window appears to have a bug and won't even make the Use Selected Item button available. See below. Observed for multiple conflicted items. How do I get this button to wake up?!!

BTW, is there a good place to post items for a LabVIEW wish list? Because the exasperating thing is, it ALREADY KNOWS which resolutions actually refer to an item and which ones don't. This thing could be 90% automated! Oh please!

[Bob_Schor]

I've "been there, done that".  This happens when you move Project Files on disk, rather than within the Project (using the "Save As" and "Rename" choices).  Also, I recommend not using Autopopulating Folders -- it will likely make things worse.

When Projects and Conflicts get really messed up, the following "manual fix" often works:

• Open Dependencies.  Look for a Conflict there.
• Right-click the Dependency, which is (probably) pointing to a File that Isn't There.  I've forgotten the choice, but you want to point it to the Correct File Location.  If you are really fortunate, you may see "Replace with File Found in this Project".
• That should resolve one "un-choosable conflict".  Now do the other 73.

Once you get past this very painful process, use Version Control to prevent (or at least mitigate the damage) a recurrence.  Should this happen again, here's a potentially Quicker Fix:

• Assume the current Project, "Shasta", is in a folder called "Shasta".  (You should probably not use numbers at the end of Folder Names -- it looks too much like "non-VCS" "versioning", something you should avoid).
• Rename the Shasta Folder to something like "Shasta Oops", something that LabVIEW doesn't know and won't find.
• Get a previous version of Shasta from the Repository, one before the Project got messed up.  Use the Repository Log to figure out how far back to go.
• Put any newly-created VIs and TypeDefs from Shasta Oops into the appropriate folder of Shasta.  These won't cause conflicts because they are New, and the Old Project doesn't (yet) know about them.  Write down what you added.
• Copy "on top of" any updated VIs and TypeDefs from Shasta Oops to the appropriate file in Shasta.  It is important to keep the location of the copied file in the same place (even if you copied it from a different folder), as this is where the Project expects it.  Again, keep a written record, including any files that you later want to move to another folder.
• When you are all finished. open the Project.  Use Add Files (or Add Folders) to add the newly-created stuff (which should be in the correct folder).  For the existing files you "updated", if you chose to move them to a different folder, use the "Save As/Rename" option from the Project window (not the Files window) to move them.  Note if you use Virtual Folders in your Project, you'll also need to put them in the correct Virtual Folder.
• As soon as you get the mess straightened out, take two more steps:
  1. Commit the (now conflict-free) Project, noting in the Log that you fixed it.
  2. Delete the Shasta Oops folder and all its content.

Bob Schor

[crossrulz]

---

@Ken_Brooks wrote:

BTW, is there a good place to post items for a LabVIEW wish list? Because the exasperating thing is, it ALREADY KNOWS which resolutions actually refer to an item and which ones don't. This thing could be 90% automated! Oh please!

---

LabVIEW Idea Exchange

---

@Ken_Brooks wrote:

Every possible conflict has come back to haunt me.

---

Yep, been there too.  I have gone through both the Dependencies route and the just open the top level VI and fix it all at the load time.  It's just a big mess whenever you move things around outside of the project.

[billko]

---

@Ken_Brooks wrote:

Using LabVIEW 17, I did a massive reorganization of a project that had grown chaotically over several months. I started a brand-new project, hoping that that would get past the well-known conflict resolution problems. I gave it auto-populating folders. But no help! Every possible conflict has come back to haunt me.

But the worst of it is, the Resolve Conflicts window appears to have a bug and won't even make the Use Selected Item button available. See below. Observed for multiple conflicted items. How do I get this button to wake up?!!

BTW, is there a good place to post items for a LabVIEW wish list? Because the exasperating thing is, it ALREADY KNOWS which resolutions actually refer to an item and which ones don't. This thing could be 90% automated! Oh please!

---

Maybe allowing you to choose it would create a conflict resolution loop that would eventually use up all available computing resources, the Universe Simulation Engine will grind to a halt, and someone will need to reboot the Universe.  (I hope they were doing regular backups; I'd hate to lose almost 14 billion years of work.)