hello, it seems like i broke my project view in the editor.
i always get “error while saving changes”
it happened after i played around with “CurveSet” in script - attributes, i had no clue how to set default Curves.
so i was playing around, with editors behavior and thought it is expecting a JSON with “keys” attribute,
this was not very smart, since that the editor always show the same error, and in the console it looks like, editor is always trying to load the old script attributes
Looks like a bug on our end because that shouldn’t happen. Now that you’ve commented out those offending attributes can you re-parse the script in the Editor (so that the attributes get removed from the script asset) and tell us if this continues to happen? You might need to refresh after re-parsing the script.
I think defaults for curve script attributes are not handled correctly at the moment. You don’t have to pass a default value for everything, you can just omit the default field, and then create your curve from the Editor.
Parsed script attribute types are stored inside the script asset, while the values (including defaults) are stored inside scene entities. If conflicts during a merge were manually resolved in an inconsistent manner, the values/declarations in the two places, and possibly in the script code itself may not match (this would be hard to enforce automatically during a merge). If you are unable to reconcile them by editing your code, parsing etc, then creating a branch from a checkpoint before the merge, as you did, is a good way to “redo” a merge