Another architectural quandary with source control

Maybe it shouldn't need to update the level layouts?

Like if you change an object, it could just store the information in its own object file. Why does it need to instantly modify the layouts when all you've done is change an object?

So if you rename a variable, the layouts wouldn't care because the events are still referencing the same hidden variable ID.

And if you removed a variable from an object, then when you open a sheet and C3 notices that a variable is missing - it would then just remove the variable references as needed. So you just wouldn't use that sheet if someone else was working on it.

Therefore, there's no conflicts with collaboration in the situation you describe.

The situation you described shouldn't normally result in a conflict. Suppose Layout1 has instances of ObjectA and ObjectB. User A modifies the position of some ObjectA instances on Layout 1. Meanwhile you change some properties of ObjectB which change how they are saved to the layout file. These should result in non-overlapping changes (i.e. they affect different lines in the layout JSON file) which all get merged fine.

Conflicts only occur when two users both modify the same lines with conflicting changes - such as if you both modify the position of ObjectA instance 1. Now the line in the layout JSON file with the position of that instance has two conflicting changes, so the source control tool will ask you to resolve the conflict.

I'd suggest having some policies about how your team work to reduce the chance of conflicts - for example making regular small incremental commits is better than waiting a month and making a huge commit with tons of changes which has a much higher risk of conflicts. And of course avoid directly working on the same thing at the same time.