PCB file gets corrupted during git merge

[eelik]

By quick reading I don’t yet understand your use case, but have you read Tools for cooperation?