Follow

What are the solutions to scene/prefab conflict merging?

Symptoms

  • There is a loss of information when trying to merge scenes and prefabs into a version control system.
  • I receive a notification that there is a merge conflict.

Cause

This can occur if you are working in a project with several people and two or more persons are modifying the same scene/prefab.

Resolution

In Unity 5, a smart merge tool was added called YAML merge tool.  Please review the documentation for information and guidance.

More Information

For more information see the link below:

https://www.reddit.com/r/Unity3D/comments/39bdq5/how_to_solve_scene_conflicts_with_unitys_smart/

 

Was this article helpful?
0 out of 0 found this helpful
Have more questions? Submit a request

0 Comments

Please sign in to leave a comment.