![]() unity "C:\Program Files\Unity\Hub\Editor\2020.2.0f1\Editor\Data\Tools\UnityYAMLMerge.exe" merge -p mergetool -a. docx "C:\Program Files\PlasticSCM5\client\diffscripts\merge-doc.exe". WINDOWS - The Preferences -> Merge Tools window Here is what they look like (note that my windows nf has already had the UnityYAMLMerge.exe file location updated, as I'll discuss below): However, on Macs the MergeTools will only be set to the single default "$text" entry. If you use the migration tool to switch from Unity Collaborate over to Plastic SCM, then on Windows PCs, you will have a premade configuration that includes entries for scenes and prefabs to use the UnityYAMLMerge.exe tool. To toggle visibility of hidden folders on Mac, press: Mac: /Users/youruser/.plastic4/nf Note: The. PC: c:/users/username/appdata/local/plastic4/nf ![]() You can either go to Preferences -> MergeTools from within the Plastic client, or you can manually edit the nf file. There are two ways to manage your MergeTool settings. By configuring Plastic to use this tool, it will analyze the changes made to that Scene, and so long as both team members didn't both change the same thing (like both team members moving object A), it will automatically combine the changes together. When you then go to push your changes to Plastic, there will be a conflict on that Scene file. TL DR - this tool will let you open a scene and move around and change things on objects A, B, C, while your teammate also has that scene open and moves around and changes things on objects X, Y, Z. UnityYAMLMerge is a merging tool that can be used on Scenes (.unity) and Prefabs (.prefab) to automatically handle the majority of merge-conflicts. Also note that the 'code snippets' below are only a SECTION of the file - so do not copy/paste to replace your entire file - its best not to copy/paste anything from here into your own file. This guide is also meant for people coming from Unity Collaborate to Plastic SCM, who may not have any previous experience with source control. ![]() I am on a PC and have very little experience with OSX, but needed to configure this for a teammate's Mac. This is just the information I've figured out from a couple emails between me and the Plastic guys - please feel free to add any more information, or correct me if anything is wrong. Hey guys, there doesn't seem to be too much information on MergeTool settings for Macs (for Unity Projects) so I figured I'd make a super basic guide.
0 Comments
Leave a Reply. |