What would be the best practices to deal with the following prefab conflict situation?
-
User A adds a script component to an existing prefab.
-
User B adds a different script component to the same prefab.
-
User A commits their change.
-
User B updates.
At this point user B gets a conflict message, and is given the choice to discard his changes, to ignore the server, or to merge.
On 2.5RC1 the merge button is enabled, but it does not do anything. The compare button allows one to see the differences between the files, and most of the conflicts look like they can be merged except for one section (m_LastMergeIdentifier). I’m guessing a custom merge tool is needed to handle this.
So…
- Does Unity provide a custom merge tool for prefabs?
- If not, does Unity have plans for such a tool?
- If not, what is the plan for handling prefab (or any non-text asset) conflicts?
- What procedures do others use to work around these problems?
oh and…
- Are there any plans to add exclusive locks to the asset server?
Any help greatly appreciated.
