
You can reduce the occurrence of conflicts by publishing small changes often, and communicating with your teammates. See in Glossary and other files using the YAML format, Collaborate uses Unity’s Smart Merge tool to perform the merge.

In each Scene, you place your environments, obstacles, and decorations, essentially designing and building your game in pieces. Think of each unique Scene file as a unique level. For Scenes A Scene contains the environments and menus of your game. For text files, Collaborate merges files using the currently configured merge tool. Collaborate automatically attempts to merge files and informs you if the attempt fails due to a conflict. See in Glossary that you have also changed, and you try to update your Project with those changes. You can also create some asset types in Unity, such as an Animator Controller, an Audio Mixer or a Render Texture.

An asset may come from a file created outside of Unity, such as a 3D model, an audio file or an image. A conflict occurs when another team member makes changes to an Asset Any media or data that can be used in your game or Project.
