Git Merge support

[rayfoundryParticipant]

Hi there,

we are experiencing problems when we try to merge asset based nodecanvas FSM or BehaviourTree entities. The “description” for the graph is just one very long string and this makes merging with diff a very frustrating experience. Now to my question:

* Any suggestions how to merge nodecanvas assets?

Maybe it would already help if the strings were structured in a multi-line way. This would probably already help?

EDIT: I’m able to merge content but it’s not as easy as with unity yaml files. I’m interested in experience other community members made using git for their projects.

Best,
Daniel

[GavalakisKeymaster]

Hello Daniel,

Merging FSM/BT assets is not something that will work very well, because each NodeCanvas asset’s data is contained within only but one long string, which is the serialized json string of the graph’s data (nodes, connections, tasks etc).
As such I think that NodeCanvas asset files, are better to be handled as if they were binary files (even though they are not), by either keeping or discarding them instead of merging, due to the mandatory custom json serialization that is used to serialize the graphs.

Thanks!

[Author]

Posts