I was thinking about merge conflicts in the context of Rust recently. In a way, the borrow checker would prevent any merge conflicts, because two people won't e

I was thinking about merge conflicts in the context of Rust recently. In a way, the borrow checker would prevent any merge conflicts, because two people won't edit the same file at the same time. But this would require a central authority to give you permissions on a file to edit it for a certain duration, during which nobody else can edit it. More software engineering research is good, I feel like we are lacking in that area. However, this was only for public code and analysis of private (company) code is not mentioned in the directions for future work. Would there be a way to extract information about conflicts and conflict resolution without giving away important parts of your code? I know that deobfuscation and retroengineering are whole fields, so I think companies wouldn't take the risk. But if there is a way to extract only the git information, maybe that would be possible.