![]() ![]() I had a couple questions about some stuff in the YAML merge tool that I haven't been able to find online. Is there any way around this? Instead of treating a Vector3 as a structure in its own right, it compares the components of the Vector3 which is no good when merging scene files. We would expect the merge to catch this as a conflict as the scenes are different but what actually happens is that the red light and the blue light are merged, resulting in a purple light in the merged scene. We have the same issues with lights, for example starting with a light with RGB values of (0, 0, 0), one user changes to (255, 0, 0) and another (0, 0, 255) as the colour of the light. I would expect the merge to be able to detect this and flag that the lights are both different and force the user performing the merge to choose one rather than accumulating the values into what is essentially a new setting. This is extremely undesirable as it matches neither scene. If one user moves the cube from (0, 0, 0) to (1, 0, 0), and another user moves the cube to (0, 0, 1), then the result of the merge is (1, 0, 1). We have a scene as a test which contains a single object (a cube) centred on the world origin. We have recently set up Smart Merge on our Perforce server and it is functional but we have discovered that some of the behaviour of the tool is undesirable and were wondering if there was something built into the tool to get around the following: 81d75fc59feed35563a24b8dd609fa29deb5ec46)Īuto-merging Assets/Scenes/GameScene.unityĬONFLICT (content): Merge conflict in Assets/Scenes/GameScene.unityĪutomatic merge failed fix conflicts and then commit the result. Warning: Cannot merge binary files: Assets/Scenes/GameScene.unity (HEAD vs. Me and my teammate have edited a scene, and when I pull the changes (git bash) it just shows me the typical error message: ![]() Prefab use "C:\Program Files\Perforce\p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" Unity use "C:\Program Files\Perforce\p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" git/config (local project) by adding this:Ĭmd = 'C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe merge' -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"Ģ) Installed Perforce P4V and added merge appsģ) Set up mergespecfile.txt modifying the uncommented lines so they look like this: Here's what I've done based on what I've read on these links:ġ) Set up both. Unfortunately I'm not sure how to make it work. I've been trying to setup UnityYAMLMerge as merge tool with Unity 5.3.1 and Git in Windows 10. Note: I followed the instructions on the smart merge page for plastic scm ![]() Wscript.exe "C:\Program Files\PlasticSCM5\client\diffscripts\diff-ppt.js" //E:javascriptīinmergetool -a I missing something? Wscript.exe "C:\Program Files\PlasticSCM5\client\diffscripts\diff-xls.js" //E:javascript This is what the nf file looks like:Ĭ:\Users\Public\Documents\Unity Projects\TapCreoĬ:\Program Files\Unity\Editor\Data\Tools\UnityYAMLMerge.exe merge -p Files\PlasticSCM5\client\diffscripts\merge-doc.exe" -a -progress=" -a "C:\Program Files\PlasticSCM5\client\diffscripts\diff-doc.js" //E:javascript Merge tools in nf are incorrectly defined I've been trying to add The smart merge capability to my Plastic SCM setup but I keep getting an error:Įrror in merge tool "C:\Program Files\Unity\Editor\Data\Tools\UnityYAMLMerge.exe merge -p execution.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |