I’m trying to merge two unity projects, without success…
I exported a package from the first project (including the main scene and all its dependencies), but when I try to import it into the second project, some assets from the first project are renamed, relocated, and erase assets of the second project!
Unity wants me to replace some assets of the second project, with assets of the package of the first project, even if these assets are not located at the same path nor have the same name in the two projects!
I think the reason is that each of these “similar” assets where one and only one object in an old project. This old project was duplicated to create the two projects we want to merge back now. So Unity seems to “remember” that these assets share the same origin, and tries to merge them back when importing the package. But these “similar” assets have been edited in the two projects, with different names and different path in the Assets directory… so Unity should not try to merge them.
My colleagues and I are really tired of the time we are spending on the integration…
AFAIK, from this forum, the Asset Server doesn’t allow multiple users to work on the same scene. Alternatively, using a revision system (as Subversion) seems very complex and may lead to disasters. Of course we may find workarounds, but we shouldn’t have to!
Unity would be perfect if a good solution for this were offered.
I am having this exact same problem at the moment, I don’t know if you’re subscribed to this topic but it would be nice to know your solution because the one I’m thinking does not sound very fun
I solved the problem by duplicating each asset and deleting the old, then reconnecting everything. It would have been a pain but my project was incredibly simple luckily.
Hi Ayrik, sorry not having noticed your post earlier!
I used the method you are describing: when a member of our team is working on a copy of a project, he has to duplicate and rename any asset he wants to modify. Then we manually merge the two projects back by importing a package of one of the two projects in the other one… losing one or two hours to check every scene and asset and to reconnect things…
Since prefabs and scenes may be saved in a text format in the upcoming Unity 3.5, I’m going to use a revision system (Git for example) for our next project in order to solve this kind of conflicts. I’m already using Git, but only on my computer where is the main copy of the project.
