Casey Hofland

Oh hey no worries, updating the Version Control package in Unity fixed the issue

Thank you for your reply @ryancassell. The issue is that they can't select PlasticSCM Merge as their Revision Control Diff/Merge tool. We see differences between our setups when resolving conflicts. When I resolve conflicts, the 3-way merge window pops up for me to review, however in our new member's case they get an error message. Unfortunately I can't say what error message exactly until Monday. One thing I can think of is that they were working directly on the cloud repo instead of on a local repo. May that have something to do with it? Thanks for the clarification about UnityYAMLMerge, it had confused me ever since I watched an old tutorial where someone showed how to set up Smart Merge for Plastic SCM.

Hi there, we recently got our first new team member on board and are looking to integrate them into our Unity project. We're having trouble with a very integral part of the onboarding process. For some reason, the option to select Plastic SCM Merge doesn't show up under their Revision Control tab. Above picture is what it should look like. We thought this to be a simple issue but honestly we're stumped. The way we remember it, we could select this option the moment Unity was set up with Plastic SCM. Regarding our new member, they've got the plastic scm software (10.0.16) and as they've already completed 2 merges we definitely know that Unity and Plastic are working together. What are we missing? While I'm here, I also wanted to ask if there's a difference between UnityYAMLMerge and Plastic SCM Merge. Googling one always brings up the other, but I am confused about if they're the same or not.