Unity Asset server: how do you merge prefab changes?

Unity Engine
1

I’m using the Team License tool for the Asset Server and it works very well in most cases. The issue I have happens when me and a colleague modify the same prefab in a scene.

If I add a script component and he adds another one and one of us commits the change, when the other person does an update then the prefab file is in conflict (we both modified it) but for some reason the merging doesn’t work. If I choose to merge the file I end up being asked if I want to convert the line ending to Windows, Mac or Unix (I tried Mac because that’s what I use, but my colleague uses Windows so I don’t know what’s the best approach here). The result is a corrupted file.

This is kind of bad because the modifications have nothing to do with each other, this happens also if I change the prefab layer and my colleague adds a collider. How can one easily merge changes like that?

Thanks

2

A colleague of mine created an editor extension which merges scenes and prefabs, UniMerge. Here’s a video of how it works. Outside of this solution, there isn’t a great answer, merging has been a long-time pitfall for Unity files.

3

You can’t really except for 3rd party solutions.

I would suggest you use another VCS system for Unity. There are a lot of great VCSs with way better feature-sets for free. Take PlasticSCM for example; you’ll be able to do exclusive check-outs and branching with it and it works great with Unity. Free for up to 10 users.