Take a look at FME, another visual 'programming language'. They've done a lot of work with their git integration, including diffing and handling merge conflicts.

https://docs.safe.com/fme/html/FME-Form-Documentation/FME-Fo...