In 5.1 (released just yesterday), they've fixed some bugs and I've tested it last night and it works like a dream. This is where it will call Unity's Smart Merge tool (YAML Smart Merge) and it will resolve the conflict. When you try to sync your changes, your version control software will tell you there's a merge conflict. (I personally use Git).įor example, when both you and a teammate on your team are working on the same scene, and both of you edit the scene in some way (it can be as trivial as moving transforms or adding a new object to the scene).
#P4MERGE UNITY HOW TO#
If you go to Unity's manual page for : Smart Merge, you can find instructions on how to use it with whatever version control software you're currently using. You can find it under the Unity/Editor/Data/Tools folder and you can run it on the command line. In Unity 5, they've added a Smart Merge tool that will resolve conflicts, but it's been buggy and inconsistent (ie: IT DON'T WORKZZZZZ WHY GOD WHYYYY). It was impossible to work on the same scene until now, so Unity projects were just worked on in separate scenes and then teams would just build a "final" scene with the work they've done at a later time instead of working on the same scene and not thinking about it, which was super inconvenient.
If you're using version control of some kind with teammate(s), then you've probably ran into the problem where you're both modifying the same scene in Unity and then syncing up your changes only to be presented with a merge conflict.
0 kommentar(er)
