Scene Merge Conflicts

timob

Hello, our team is experiencing a large amount of merge conflicts that are almost exclusively caused by the instance id in the JSON data of actions changing per branch. Will the instance ID in JSON data even effect anything or is it just automatically generated? Has anyone experienced this and/or are there any suggestions or solutions to this? We also have noticed merge conflicts caused by node positions, but those aren't as big of a deal.

Thanks for your help.

ChrisIceBox

Welcome to the community, @timob.

If it's coming from AC, the Json data in your scene is the backup data of your ActionLists.

By default, ActionLists are backed up every 10 minutes, but you can disable this within the Adventure Creator section of your project settings.

To remove this backup data from your scene, run this code:

var actionLists = FindObjectsOfType<AC.ActionList> ();
foreach (var actionList in actionLists)
    actionList.ClearData ();

If you are merging scenes, however, I would recommend the use of ActionLists asset files instead of scene-based ones. That way, all ActionList data can be separated from your scenes, making it much easier to merge.

You can convert scene-based ActionLists to asset files also via the cog button. For objects that reference ActionLists, such as Hotspots and the Scene Manager, you can set the Asset source field to Asset File to have them reference assets instead.

For more advice regarding merging, see the Manual's "Version control and collaboration" chapter.