noble bloom
We are working on Scene Fusion, a plugin that allows people to collaborate in Unity like Google Docs.
We are currently working on features to make it work better with source control.
SF syncs scene changes as well as some file assets: prefabs (creation only, editing coming very soon), materials, lighting settings, and terrains. This can cause source control conflicts.
We have some strategies to mitigate these:
- Do nothing with source control, just give users the ability to turn off file asset syncing in collab sessions.
- Use source control transfer the asset files if it's available, otherwise use our collaboration server as we do now.
- Automatically make a branch for each connected user, and check in changes to the branch. Later, one of the branches can be chosen and merged in.
How would you order these options from most to least preferential? We will likely implement all, or some variation of all of these, we just need some input to know the order.
turbid bough