Good news for you: I'm well on the way to solving the problem of better code merging. Specifically, the algorithms I am developing appear to be able to do a cor

Good news for you: I'm well on the way to solving the problem of better code merging. Specifically, the algorithms I am developing appear to be able to do a correct merge on both [1] and [2]. They also appear capable of merging binary data. The tradeoff is that people need to write some code to tell the VCS about the format of each binary file type or semantics of each programming language. The biggest problem is that, like Rust, a new VCS has to be well-executed to make its innovation stick. We'll see if I succeed. [1]: https://tahoe-lafs.org/~zooko/badmerge/simple.html https://tahoe-lafs.org/~zooko/badmerge/simple.html [2]: https://tahoe-lafs.org/~zooko/badmerge/concrete-bad-semantics.html https://tahoe-lafs.org/~zooko/badmerge/concrete-bad-semantic...